Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/views/toolbar/reload_button_unittest.cc

 // Copyright 2013 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 "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/views/toolbar/reload_button.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
 
-class ReloadButtonTest : public testing::Test {
+class ReloadButtonTest : public ChromeRenderViewHostTestHarness {
  public:
   ReloadButtonTest();
 
   void CheckState(bool enabled,
                   ReloadButton::Mode intended_mode,
                   ReloadButton::Mode visible_mode,
                   bool double_click_timer_running,
                   bool stop_to_reload_timer_running);
 
   // These accessors eliminate the need to declare each testcase as a friend.
   void set_mouse_hovered(bool hovered) {
     reload_.testing_mouse_hovered_ = hovered;
   }
   int reload_count() { return reload_.testing_reload_count_; }
 
  protected:
-  // We need a message loop for the timers to post events.
-  base::MessageLoop loop_;
-
   ReloadButton reload_;
 };
 
-ReloadButtonTest::ReloadButtonTest() : reload_(NULL) {
+ReloadButtonTest::ReloadButtonTest() : reload_(profile(), nullptr) {
   // Set the timer delays to 0 so that timers will fire as soon as we tell the
   // message loop to run pending tasks.
   reload_.double_click_timer_delay_ = base::TimeDelta();
   reload_.stop_to_reload_timer_delay_ = base::TimeDelta();
 }
 
 void ReloadButtonTest::CheckState(bool enabled,
                                   ReloadButton::Mode intended_mode,
                                   ReloadButton::Mode visible_mode,
                                   bool double_click_timer_running,
@@ skipping 47 matching lines @@
   EXPECT_EQ(original_reload_count, reload_count());
 
   // Hover the button, and change mode.  The visible mode should not change,
   // again because the timer is running.
   set_mouse_hovered(true);
   reload_.ChangeMode(ReloadButton::MODE_STOP, false);
   CheckState(true, ReloadButton::MODE_STOP, ReloadButton::MODE_RELOAD, true,
              false);
 
   // Now fire the timer.  This should complete the mode change.
-  loop_.RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   CheckState(true, ReloadButton::MODE_STOP, ReloadButton::MODE_STOP, false,
              false);
 }
 
 TEST_F(ReloadButtonTest, DisableOnHover) {
   // Change to stop and hover.
   ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                    ui::EventTimeForNow(), 0, 0);
   reload_.ButtonPressed(&reload_, e);
   reload_.ChangeMode(ReloadButton::MODE_STOP, false);
@@ skipping 32 matching lines @@
 TEST_F(ReloadButtonTest, ResetOnTimer) {
   // Change to stop, hover, and change back to reload.
   ui::MouseEvent e(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                    ui::EventTimeForNow(), 0, 0);
   reload_.ButtonPressed(&reload_, e);
   reload_.ChangeMode(ReloadButton::MODE_STOP, false);
   set_mouse_hovered(true);
   reload_.ChangeMode(ReloadButton::MODE_RELOAD, false);
 
   // Now fire the stop-to-reload timer.  This should reset the button.
-  loop_.RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   CheckState(true, ReloadButton::MODE_RELOAD, ReloadButton::MODE_RELOAD, false,
              false);
 }