Remove shelf_view_unittest's ScopedMockTaskRunnerWrapper copy.

ash/shelf/shelf_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 26 matching lines @@
 #include "ash/test/overflow_bubble_view_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
-#include "base/test/test_mock_time_task_runner.h"
+#include "base/test/scoped_mock_time_message_loop_task_runner.h"
 #include "base/test/user_action_tester.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
@@ skipping 2538 matching lines @@
   ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
                                    const ShelfItem* item) override {
     // Caller takes ownership of the returned object.
     return new TestShellMenuModel;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestOverflowButtonShellDelegate);
 };
 
-// A scoped wrapper around TestMockTimeTaskRunner that replaces message loop's
-// task runner with a TestMockTimeTaskRunner and resets it back at the end of
-// the scope.
-class ScopedMockTaskRunnerWrapper {
- public:
-  ScopedMockTaskRunnerWrapper() {
-    mock_task_runner_ = new base::TestMockTimeTaskRunner;
-    previous_task_runner_ = base::ThreadTaskRunnerHandle::Get();
-    base::MessageLoop::current()->SetTaskRunner(mock_task_runner_);
-  }
-
-  ~ScopedMockTaskRunnerWrapper() {
-    DCHECK_EQ(mock_task_runner_, base::ThreadTaskRunnerHandle::Get());
-    mock_task_runner_->ClearPendingTasks();
-    base::MessageLoop::current()->SetTaskRunner(previous_task_runner_);
-  }
-
-  void FastForwardUntilNoTasksRemain() {
-    mock_task_runner_->FastForwardUntilNoTasksRemain();
-  }
-
- private:
-  scoped_refptr<base::TestMockTimeTaskRunner> mock_task_runner_;
-  scoped_refptr<base::SingleThreadTaskRunner> previous_task_runner_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedMockTaskRunnerWrapper);
-};
-
 }  // namespace
 
 // Test fixture for testing material design ink drop on overflow button.
 class OverflowButtonInkDropTest : public ShelfViewInkDropTest {
  public:
   OverflowButtonInkDropTest() {}
   ~OverflowButtonInkDropTest() override {}
 
   void SetUp() override {
     ShelfViewInkDropTest::SetUp();
@@ skipping 238 matching lines @@
               IsEmpty());
 
   EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
 }
 
 // Tests ink drop state transitions for the overflow button when the user long
 // presses on the button to show the context menu.
 TEST_F(OverflowButtonInkDropTest, TouchContextMenu) {
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(GetScreenPointInsideOverflowButton());
+  base::ScopedMockTimeMessageLoopTaskRunner mock_task_runner;

[James Cook, 2016/11/28 23:05:15]

Wow, I had no idea that ScopedMockTimeMessageLoopTaskRunner was a thing. :-)

[msw, 2016/11/28 23:21:31]

Neither did I; it came up in a review I did, and I found this copy.

 
-  RunAllPendingInMessageLoop();
-  {
-    ScopedMockTaskRunnerWrapper mock_task_runner;
+  generator.PressTouch();
+  EXPECT_EQ(views::InkDropState::ACTION_PENDING,
+            overflow_button_ink_drop_->GetTargetInkDropState());
+  EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
+              ElementsAre(views::InkDropState::ACTION_PENDING));
 
-    generator.PressTouch();
-    EXPECT_EQ(views::InkDropState::ACTION_PENDING,
-              overflow_button_ink_drop_->GetTargetInkDropState());
-    EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
-                ElementsAre(views::InkDropState::ACTION_PENDING));
+  mock_task_runner->FastForwardUntilNoTasksRemain();
+  EXPECT_EQ(views::InkDropState::HIDDEN,
+            overflow_button_ink_drop_->GetTargetInkDropState());
+  EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
+              ElementsAre(views::InkDropState::ALTERNATE_ACTION_PENDING,
+                          views::InkDropState::HIDDEN));
 
-    mock_task_runner.FastForwardUntilNoTasksRemain();
-    EXPECT_EQ(views::InkDropState::HIDDEN,
-              overflow_button_ink_drop_->GetTargetInkDropState());
-    EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
-                ElementsAre(views::InkDropState::ALTERNATE_ACTION_PENDING,
-                            views::InkDropState::HIDDEN));
+  generator.ReleaseTouch();
+  EXPECT_EQ(views::InkDropState::HIDDEN,
+            overflow_button_ink_drop_->GetTargetInkDropState());
+  EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
+              IsEmpty());
 
-    generator.ReleaseTouch();
-    EXPECT_EQ(views::InkDropState::HIDDEN,
-              overflow_button_ink_drop_->GetTargetInkDropState());
-    EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
-                IsEmpty());
-
-    EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
-  }
+  EXPECT_FALSE(test_api_->IsShowingOverflowBubble());
 }
 
 #endif  // !defined(OS_WIN)
 
 // Test fixture for testing material design ink drop on overflow button when it
 // is active.
 class OverflowButtonActiveInkDropTest : public OverflowButtonInkDropTest {
  public:
   OverflowButtonActiveInkDropTest() {}
   ~OverflowButtonActiveInkDropTest() override {}
@@ skipping 199 matching lines @@
               IsEmpty());
 
   ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
 // Tests ink drop state transitions for the overflow button when it is active
 // and the user long presses on the button to show the context menu.
 TEST_F(OverflowButtonActiveInkDropTest, TouchContextMenu) {
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.set_current_location(GetScreenPointInsideOverflowButton());
+  base::ScopedMockTimeMessageLoopTaskRunner mock_task_runner;
 
-  RunAllPendingInMessageLoop();
-  {
-    ScopedMockTaskRunnerWrapper mock_task_runner;
+  generator.PressTouch();
+  EXPECT_EQ(views::InkDropState::ACTIVATED,
+            overflow_button_ink_drop_->GetTargetInkDropState());
+  EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
+              IsEmpty());
 
-    generator.PressTouch();
-    EXPECT_EQ(views::InkDropState::ACTIVATED,
-              overflow_button_ink_drop_->GetTargetInkDropState());
-    EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
-                IsEmpty());
+  mock_task_runner->FastForwardUntilNoTasksRemain();
+  EXPECT_EQ(views::InkDropState::ACTIVATED,
+            overflow_button_ink_drop_->GetTargetInkDropState());
+  EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
+              IsEmpty());
 
-    mock_task_runner.FastForwardUntilNoTasksRemain();
-    EXPECT_EQ(views::InkDropState::ACTIVATED,
-              overflow_button_ink_drop_->GetTargetInkDropState());
-    EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
-                IsEmpty());
+  generator.ReleaseTouch();
+  EXPECT_EQ(views::InkDropState::ACTIVATED,
+            overflow_button_ink_drop_->GetTargetInkDropState());
+  EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
+              IsEmpty());
 
-    generator.ReleaseTouch();
-    EXPECT_EQ(views::InkDropState::ACTIVATED,
-              overflow_button_ink_drop_->GetTargetInkDropState());
-    EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
-                IsEmpty());
-
-    ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
-  }
+  ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace test
 }  // namespace ash