Changes code using Compositor to pass in ContextFactory

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1093 matching lines @@
 // windows. It additionally tests whether the destruction of these windows
 // occurs correctly in desktop AURA without crashing.
 // It provides facilities to test the following cases:-
 // 1. Child window destroyed which should lead to the destruction of the
 //    parent.
 // 2. Parent window destroyed which should lead to the child being destroyed.
 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_);
     EXPECT_TRUE(owned_window_destroyed_);
     top_level_widget_ = NULL;
     owned_window_ = NULL;
   }
 
   // views::TestViewsDelegate overrides.
   virtual void OnBeforeWidgetInit(
@@ skipping 73 matching lines @@
   aura::Window* owned_window_;
   bool owner_destroyed_;
   bool owned_window_destroyed_;
   aura::test::TestWindowDelegate child_window_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(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));
 
   RunPendingMessages();
   ASSERT_NO_FATAL_FAILURE(fullscreen_window.DestroyOwnedWindow());
   RunPendingMessages();
 }
 
 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));
 
   RunPendingMessages();
   ASSERT_NO_FATAL_FAILURE(fullscreen_window.DestroyOwnerWindow());
   RunPendingMessages();
 }
 
 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));
 
   RunPendingMessages();
   ASSERT_NO_FATAL_FAILURE(popup_window.DestroyOwnedWindow());
   RunPendingMessages();
 }
 
 // This test validates that when a top level owned popup Aura window is
 // 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));
 
   gfx::Rect new_size(0, 0, 400, 400);
   popup_window.owned_window()->SetBounds(new_size);
 
   EXPECT_EQ(popup_window.top_level_widget()->GetNativeView()->bounds().size(),
             new_size.size());
   RunPendingMessages();
   ASSERT_NO_FATAL_FAILURE(popup_window.DestroyOwnedWindow());
@@ skipping 420 matching lines @@
 TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) {
   // Override to use a DesktopNativeWidget.
   bool desktop_native_widget = true;
   RunTest(desktop_native_widget);
 }
 #endif  // !OS_CHROMEOS
 
 // 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_; }
   bool is_top_level() const { return is_top_level_; }
 
   virtual void OnBeforeWidgetInit(
       Widget::InitParams* params,
       internal::NativeWidgetDelegate* delegate) OVERRIDE {
     on_before_init_called_ = true;
     is_top_level_ = params->top_level;
   }
 
  private:
   bool on_before_init_called_;
   bool is_top_level_;
 
   DISALLOW_COPY_AND_ASSIGN(VerifyTopLevelDelegate);
 };
 
 // Verifies |top_level| is correctly passed to
 // 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 =
       CreateParams(views::Widget::InitParams::TYPE_POPUP);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
   EXPECT_TRUE(delegate->on_before_init_called());
   EXPECT_TRUE(delegate->is_top_level());
 }
 
@@ skipping 737 matching lines @@
   child_widget.Init(child_params);
   child_widget.AddObserver(&observer);
   child_widget.Show();
 
   parent_widget.CloseNow();
 }
 #endif
 
 }  // namespace test
 }  // namespace views