Adding namespaces to prevent name collisions in jumbo builds

Several test classes in scheduler use the same name. As an alternative
to renaming them, or some of them, use unique namespaces. This
solves problems with MockTask and MockObserver.

Bug: 745732
Change-Id: I56da313dbbfb116d28d45ccd5f261cdfbf48d188
Reviewed-on: https://chromium-review.googlesource.com/687674
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505147}

third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc

@@ -44,8 +44,8 @@ using blink::scheduler::internal::EnqueueOrder;
 
 namespace blink {
 namespace scheduler {
-namespace task_queue_manager_unittest {  // To avoid symbol collisions in jumbo
-                                         // builds.
+// To avoid symbol collisions in jumbo builds.
+namespace task_queue_manager_unittest {
 
 class TaskQueueManagerForTest : public TaskQueueManager {
  public:

third_party/WebKit/Source/platform/scheduler/base/task_queue_selector_unittest.cc

@@ -24,6 +24,8 @@ using ::testing::_;
 namespace blink {
 namespace scheduler {
 namespace internal {
+// To avoid symbol collisions in jumbo builds.
+namespace task_queue_selector_unittest {
 
 class MockObserver : public TaskQueueSelector::Observer {
  public:
@@ -564,6 +566,7 @@ INSTANTIATE_TEST_CASE_P(
     ChooseOldestWithPriorityTest,
     ::testing::ValuesIn(kChooseOldestWithPriorityTestCases));
 
+}  // namespace task_queue_selector_unittest
 }  // namespace internal
 }  // namespace scheduler
 }  // namespace blink

third_party/WebKit/Source/platform/scheduler/child/scheduler_helper_unittest.cc

@@ -26,6 +26,7 @@ using ::testing::Return;
 
 namespace blink {
 namespace scheduler {
+namespace scheduler_helper_unittest {
 
 namespace {
 void AppendToVectorTestTask(std::vector<std::string>* vector,
@@ -215,6 +216,6 @@ TEST_F(SchedulerHelperTest, OnTriedToExecuteBlockedTask) {
 
   scheduler_helper_->SetObserver(nullptr);
 }
-
+}  // namespace scheduler_helper_unittest
 }  // namespace scheduler
 }  // namespace blink

third_party/WebKit/Source/platform/scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc

@@ -20,7 +20,7 @@ using ::testing::Invoke;
 
 namespace blink {
 namespace scheduler {
-namespace {
+namespace webthread_impl_for_worker_scheduler_unittest {
 
 class MockTask {
  public:
@@ -68,8 +68,6 @@ void ShutdownOnThread(WebThreadImplForWorkerScheduler* thread) {
   web_scheduler_impl->Shutdown();
 }
 
-}  // namespace
-
 class WebThreadImplForWorkerSchedulerTest : public ::testing::Test {
  public:
   WebThreadImplForWorkerSchedulerTest() {}
@@ -194,5 +192,6 @@ TEST_F(WebThreadImplForWorkerSchedulerTest, TestShutdown) {
   thread_.reset();
 }
 
+}  // namespace webthread_impl_for_worker_scheduler_unittest
 }  // namespace scheduler
 }  // namespace blink

third_party/WebKit/Source/platform/scheduler/renderer/render_widget_signals_unittest.cc

@@ -15,8 +15,9 @@ using ::testing::_;
 
 namespace blink {
 namespace scheduler {
+// To avoid symbol collisions in jumbo builds.
+namespace render_widget_signals_unittest {
 
-namespace {
 class MockObserver : public RenderWidgetSignals::Observer {
  public:
   MockObserver() {}
@@ -29,7 +30,6 @@ class MockObserver : public RenderWidgetSignals::Observer {
  private:
   DISALLOW_COPY_AND_ASSIGN(MockObserver);
 };
-}
 
 class RenderWidgetSignalsTest : public ::testing::Test {
  public:
@@ -264,5 +264,6 @@ TEST_F(RenderWidgetSignalsTest,
   IgnoreWidgetDestructionCallbacks();
 }
 
+}  // namespace render_widget_signals_unittest
 }  // namespace scheduler
 }  // namespace blink

third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc

@@ -28,8 +28,8 @@ using ::testing::ElementsAre;
 
 namespace blink {
 namespace scheduler {
-namespace task_queue_throttler_unittest {  // To avoid symbol collisions in
-                                           // jumbo builds.
+// To avoid symbol collisions in jumbo builds.
+namespace task_queue_throttler_unittest {
 
 bool MessageLoopTaskCounter(size_t* count) {
   *count = *count + 1;

third_party/WebKit/Source/platform/scheduler/renderer/web_frame_scheduler_impl_unittest.cc

@@ -20,8 +20,8 @@
 
 namespace blink {
 namespace scheduler {
-namespace web_frame_scheduler_impl_unittest {  // To avoid symbol collisions in
-                                               // jumbo builds.
+// To avoid symbol collisions in jumbo builds.
+namespace web_frame_scheduler_impl_unittest {
 
 class WebFrameSchedulerImplTest : public ::testing::Test {
  public:

third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc

@@ -27,8 +27,8 @@ using VirtualTimePolicy = blink::WebViewScheduler::VirtualTimePolicy;
 
 namespace blink {
 namespace scheduler {
-namespace web_view_scheduler_impl_unittest {  // To avoid symbol collisions in
-                                              // jumbo builds.
+// To avoid symbol collisions in jumbo builds.
+namespace web_view_scheduler_impl_unittest {
 
 class WebViewSchedulerImplTest : public ::testing::Test {
  public:

third_party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc

@@ -23,7 +23,8 @@
 
 namespace blink {
 namespace scheduler {
-namespace {
+// To avoid symbol collisions in jumbo builds.
+namespace webthread_impl_for_renderer_scheduler_unittest {
 
 const int kWorkBatchSize = 2;
 
@@ -37,7 +38,6 @@ class MockTaskObserver : public blink::WebThread::TaskObserver {
   MOCK_METHOD0(WillProcessTask, void());
   MOCK_METHOD0(DidProcessTask, void());
 };
-}  // namespace
 
 class WebThreadImplForRendererSchedulerTest : public ::testing::Test {
  public:
@@ -203,5 +203,6 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestNestedRunLoop) {
   thread_->RemoveTaskObserver(&observer);
 }
 
+}  // namespace webthread_impl_for_renderer_scheduler_unittest
 }  // namespace scheduler
 }  // namespace blink