Changes code using Compositor to pass in ContextFactory

ui/views/widget/widget_unittest.cc

Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index a650ecfc1fac1908504a46bdf55f4b42758e2bcf..7eeb0630897573efcdb1b6d5859dcfc29c9d19e4 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -1111,11 +1111,13 @@ class DesktopAuraTopLevelWindowTest
     : public views::TestViewsDelegate,
       public aura::WindowObserver {
  public:
-  DesktopAuraTopLevelWindowTest()
+  explicit DesktopAuraTopLevelWindowTest(ui::ContextFactory* context_factory)
       : top_level_widget_(NULL),
         owned_window_(NULL),
         owner_destroyed_(false),
-        owned_window_destroyed_(false) {}
+        owned_window_destroyed_(false) {
+    set_context_factory(context_factory);
+  }
 
   virtual ~DesktopAuraTopLevelWindowTest() {
     EXPECT_TRUE(owner_destroyed_);
@@ -1209,7 +1211,7 @@ class DesktopAuraTopLevelWindowTest
 
 TEST_F(WidgetTest, DesktopAuraFullscreenWindowDestroyedBeforeOwnerTest) {
   ViewsDelegate::views_delegate = NULL;
-  DesktopAuraTopLevelWindowTest fullscreen_window;
+  DesktopAuraTopLevelWindowTest fullscreen_window(context_factory());
   ASSERT_NO_FATAL_FAILURE(fullscreen_window.CreateTopLevelWindow(
       gfx::Rect(0, 0, 200, 200), true));
 
@@ -1221,7 +1223,7 @@ TEST_F(WidgetTest, DesktopAuraFullscreenWindowDestroyedBeforeOwnerTest) {
 TEST_F(WidgetTest, DesktopAuraFullscreenWindowOwnerDestroyed) {
   ViewsDelegate::views_delegate = NULL;
 
-  DesktopAuraTopLevelWindowTest fullscreen_window;
+  DesktopAuraTopLevelWindowTest fullscreen_window(context_factory());
   ASSERT_NO_FATAL_FAILURE(fullscreen_window.CreateTopLevelWindow(
       gfx::Rect(0, 0, 200, 200), true));
 
@@ -1232,7 +1234,7 @@ TEST_F(WidgetTest, DesktopAuraFullscreenWindowOwnerDestroyed) {
 
 TEST_F(WidgetTest, DesktopAuraTopLevelOwnedPopupTest) {
   ViewsDelegate::views_delegate = NULL;
-  DesktopAuraTopLevelWindowTest popup_window;
+  DesktopAuraTopLevelWindowTest popup_window(context_factory());
   ASSERT_NO_FATAL_FAILURE(popup_window.CreateTopLevelWindow(
       gfx::Rect(0, 0, 200, 200), false));
 
@@ -1245,7 +1247,7 @@ TEST_F(WidgetTest, DesktopAuraTopLevelOwnedPopupTest) {
 // resized, the widget is resized as well.
 TEST_F(WidgetTest, DesktopAuraTopLevelOwnedPopupResizeTest) {
   ViewsDelegate::views_delegate = NULL;
-  DesktopAuraTopLevelWindowTest popup_window;
+  DesktopAuraTopLevelWindowTest popup_window(context_factory());
   ASSERT_NO_FATAL_FAILURE(popup_window.CreateTopLevelWindow(
       gfx::Rect(0, 0, 200, 200), false));
 
@@ -1686,9 +1688,10 @@ TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) {
 // Used by SetTopLevelCorrectly to track calls to OnBeforeWidgetInit().
 class VerifyTopLevelDelegate : public TestViewsDelegate {
  public:
-  VerifyTopLevelDelegate()
+  explicit VerifyTopLevelDelegate(ui::ContextFactory* context_factory)
       : on_before_init_called_(false),
         is_top_level_(false) {
+    set_context_factory(context_factory);
   }
 
   bool on_before_init_called() const { return on_before_init_called_; }
@@ -1712,7 +1715,8 @@ class VerifyTopLevelDelegate : public TestViewsDelegate {
 // ViewsDelegate::OnBeforeWidgetInit().
 TEST_F(WidgetTest, SetTopLevelCorrectly) {
   set_views_delegate(NULL);
-  VerifyTopLevelDelegate* delegate = new VerifyTopLevelDelegate;
+  VerifyTopLevelDelegate* delegate =
+      new VerifyTopLevelDelegate(context_factory());
   set_views_delegate(delegate);  // ViewsTestBase takes ownership.
   scoped_ptr<Widget> widget(new Widget);
   Widget::InitParams params =