1 diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc 2 index 1a21fc5..7743479 100644 3 --- a/base/message_loop/message_loop_unittest.cc 4 +++ b/base/message_loop/message_loop_unittest.cc 5 @@ -22,7 +22,8 @@ 6 #include "base/run_loop.h" 7 #include "base/single_thread_task_runner.h" 8 #include "base/synchronization/waitable_event.h" 9 -#include "base/task_scheduler/task_scheduler.h" 10 +// Unsupported in libchrome 11 +// #include "base/task_scheduler/task_scheduler.h" 12 #include "base/test/gtest_util.h" 13 #include "base/test/test_simple_task_runner.h" 14 #include "base/test/test_timeouts.h" 15 @@ -260,7 +261,8 @@ void PostNTasks(int posts_remaining) { 16 17 enum class TaskSchedulerAvailability { 18 NO_TASK_SCHEDULER, 19 - WITH_TASK_SCHEDULER, 20 + // Unsupported in libchrome. 21 + // WITH_TASK_SCHEDULER, 22 }; 23 24 std::string TaskSchedulerAvailabilityToString( 25 @@ -268,8 +270,9 @@ std::string TaskSchedulerAvailabilityToString( 26 switch (availability) { 27 case TaskSchedulerAvailability::NO_TASK_SCHEDULER: 28 return "NoTaskScheduler"; 29 - case TaskSchedulerAvailability::WITH_TASK_SCHEDULER: 30 - return "WithTaskScheduler"; 31 + // Unsupported in libchrome. 32 + // case TaskSchedulerAvailability::WITH_TASK_SCHEDULER: 33 + // return "WithTaskScheduler"; 34 } 35 NOTREACHED(); 36 return "Unknown"; 37 @@ -282,11 +285,16 @@ class MessageLoopTest 38 ~MessageLoopTest() override = default; 39 40 void SetUp() override { 41 + // Unsupported in libchrome. 42 +#if 0 43 if (GetParam() == TaskSchedulerAvailability::WITH_TASK_SCHEDULER) 44 TaskScheduler::CreateAndStartWithDefaultParams("MessageLoopTest"); 45 +#endif 46 } 47 48 void TearDown() override { 49 + // Unsupported in libchrome. 50 +#if 0 51 if (GetParam() == TaskSchedulerAvailability::WITH_TASK_SCHEDULER) { 52 // Failure to call FlushForTesting() could result in task leaks as tasks 53 // are skipped on shutdown. 54 @@ -295,6 +303,7 @@ class MessageLoopTest 55 base::TaskScheduler::GetInstance()->JoinForTesting(); 56 base::TaskScheduler::SetInstance(nullptr); 57 } 58 +#endif 59 } 60 61 static std::string ParamInfoToString( 62 @@ -776,13 +785,18 @@ class MessageLoopTypedTest 63 ~MessageLoopTypedTest() = default; 64 65 void SetUp() override { 66 +// Unsupported in libchrome. 67 +#if 0 68 if (GetTaskSchedulerAvailability() == 69 TaskSchedulerAvailability::WITH_TASK_SCHEDULER) { 70 TaskScheduler::CreateAndStartWithDefaultParams("MessageLoopTypedTest"); 71 } 72 +#endif 73 } 74 75 void TearDown() override { 76 +// Unsupported in libchrome. 77 +#if 0 78 if (GetTaskSchedulerAvailability() == 79 TaskSchedulerAvailability::WITH_TASK_SCHEDULER) { 80 // Failure to call FlushForTesting() could result in task leaks as tasks 81 @@ -792,6 +806,7 @@ class MessageLoopTypedTest 82 base::TaskScheduler::GetInstance()->JoinForTesting(); 83 base::TaskScheduler::SetInstance(nullptr); 84 } 85 +#endif 86 } 87 88 static std::string ParamInfoToString( 89 @@ -1769,8 +1784,10 @@ INSTANTIATE_TEST_CASE_P( 90 TaskSchedulerAvailability::NO_TASK_SCHEDULER), 91 MessageLoopTypedTestParams( 92 MessageLoop::TYPE_UI, 93 - TaskSchedulerAvailability::NO_TASK_SCHEDULER), 94 - MessageLoopTypedTestParams( 95 + TaskSchedulerAvailability::NO_TASK_SCHEDULER) 96 +// Unsupported in libchrome. 97 +#if 0 98 + ,MessageLoopTypedTestParams( 99 MessageLoop::TYPE_DEFAULT, 100 TaskSchedulerAvailability::WITH_TASK_SCHEDULER), 101 MessageLoopTypedTestParams( 102 @@ -1778,7 +1795,9 @@ INSTANTIATE_TEST_CASE_P( 103 TaskSchedulerAvailability::WITH_TASK_SCHEDULER), 104 MessageLoopTypedTestParams( 105 MessageLoop::TYPE_UI, 106 - TaskSchedulerAvailability::WITH_TASK_SCHEDULER)), 107 + TaskSchedulerAvailability::WITH_TASK_SCHEDULER) 108 +#endif 109 + ), 110 MessageLoopTypedTest::ParamInfoToString); 111 112 #if defined(OS_WIN) 113 @@ -2210,8 +2229,10 @@ TEST_P(MessageLoopTest, SequenceLocalStorageDifferentMessageLoops) { 114 INSTANTIATE_TEST_CASE_P( 115 , 116 MessageLoopTest, 117 - ::testing::Values(TaskSchedulerAvailability::NO_TASK_SCHEDULER, 118 - TaskSchedulerAvailability::WITH_TASK_SCHEDULER), 119 + ::testing::Values(TaskSchedulerAvailability::NO_TASK_SCHEDULER 120 + // Unsupported in libchrome 121 + //, TaskSchedulerAvailability::WITH_TASK_SCHEDULER 122 + ), 123 MessageLoopTest::ParamInfoToString); 124 125 namespace { 126