Changes code using Compositor to pass in ContextFactory

ui/views/corewm/tooltip_controller_unittest.cc

Index: ui/views/corewm/tooltip_controller_unittest.cc
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
index f09a2a0533e92f0f1d25e618914cbc56f33426d4..894585ce2e7468a64543f055c8b8c0f90b37a9eb 100644
--- a/ui/views/corewm/tooltip_controller_unittest.cc
+++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ui/views/corewm/tooltip_controller.h"
 
+#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
@@ -22,6 +23,7 @@
 #include "ui/gfx/text_elider.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/corewm/tooltip_controller_test_helper.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
@@ -71,15 +73,17 @@ TooltipController* GetController(Widget* widget) {
 
 }  // namespace
 
-class TooltipControllerTest : public aura::test::AuraTestBase {
+class TooltipControllerTest : public ViewsTestBase {
  public:
   TooltipControllerTest() : view_(NULL) {}
   virtual ~TooltipControllerTest() {}
 
+  aura::Window* root_window() {
+    return GetContext();
+  }
+
   virtual void SetUp() OVERRIDE {
-    wm_state_.reset(new wm::WMState);
-    aura::test::AuraTestBase::SetUp();
-    new wm::DefaultActivationClient(root_window());
+    ViewsTestBase::SetUp();
 #if defined(OS_CHROMEOS)
     controller_.reset(new TooltipController(
           scoped_ptr<views::corewm::Tooltip>(
@@ -87,7 +91,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
 #endif
-    widget_.reset(CreateWidget(root_window()));
+    widget_.reset(CreateWidget(GetContext()));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
@@ -106,7 +110,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
     generator_.reset();
     helper_.reset();
     widget_.reset();
-    aura::test::AuraTestBase::TearDown();
+    ViewsTestBase::TearDown();
     wm_state_.reset();
   }
 
@@ -435,11 +439,12 @@ class TestScreenPositionClient : public aura::client::ScreenPositionClient {
 
 class TooltipControllerCaptureTest : public TooltipControllerTest {
  public:
-  TooltipControllerCaptureTest() {}
+  TooltipControllerCaptureTest() : original_screen_(NULL) {}
   virtual ~TooltipControllerCaptureTest() {}
 
   virtual void SetUp() OVERRIDE {
     TooltipControllerTest::SetUp();
+    original_screen_ = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE);
     aura::client::SetScreenPositionClient(GetRootWindow(),
                                           &screen_position_client_);
 #if !defined(OS_CHROMEOS)
@@ -451,7 +456,7 @@ class TooltipControllerCaptureTest : public TooltipControllerTest {
 
   virtual void TearDown() OVERRIDE {
 #if !defined(OS_CHROMEOS)
-    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen());
+    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, original_screen_);
     desktop_screen_.reset();
 #endif
     aura::client::SetScreenPositionClient(GetRootWindow(), NULL);
@@ -459,6 +464,7 @@ class TooltipControllerCaptureTest : public TooltipControllerTest {
   }
 
  private:
+  gfx::Screen* original_screen_;
   TestScreenPositionClient screen_position_client_;
   scoped_ptr<gfx::Screen> desktop_screen_;
 
@@ -468,7 +474,10 @@ class TooltipControllerCaptureTest : public TooltipControllerTest {
 // Verifies when capture is released the TooltipController resets state.
 TEST_F(TooltipControllerCaptureTest, CloseOnCaptureLost) {
   view_->GetWidget()->SetCapture(view_);
-  RunAllPendingInMessageLoop();
+  {
+    base::RunLoop run_loop;
+    run_loop.RunUntilIdle();
+  }
   view_->set_tooltip_text(ASCIIToUTF16("Tooltip Text"));
   generator_->MoveMouseToCenterOf(GetWindow());
   base::string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
@@ -500,7 +509,7 @@ TEST_F(TooltipControllerCaptureTest, MAYBE_Capture) {
   widget_->SetBounds(gfx::Rect(0, 0, 200, 200));
   view_->set_tooltip_text(tooltip_text);
 
-  scoped_ptr<views::Widget> widget2(CreateWidget(root_window()));
+  scoped_ptr<views::Widget> widget2(CreateWidget(GetContext()));
   widget2->SetContentsView(new View);
   TooltipTestView* view2 = new TooltipTestView;
   widget2->GetContentsView()->AddChildView(view2);