Continue threading context through unit tests.

ash/wm/window_modality_controller_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 "ui/views/corewm/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 344 matching lines @@
 // - A |child| window with parent window |parent|, but is modal to
 //   |modal_parent| window.
 // Validates:
 // - Clicking on the |modal_parent| should activate the |child| window.
 // - Clicking on the |parent| window outside of the |modal_parent| bounds should
 //   activate the |parent| window.
 // - Clicking on the |child| while |parent| is active should activate the
 //   |child| window.
 // - Focus should follow the active window.
 TEST_F(WindowModalityControllerTest, ChildModal) {
-  views::test::ChildModalParent* delegate = new views::test::ChildModalParent;
-  views::Widget* widget = views::Widget::CreateWindowWithBounds(
-      delegate, gfx::Rect(0, 0, 400, 400));
+  views::test::ChildModalParent* delegate =
+      new views::test::ChildModalParent(CurrentContext());
+  views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
+      delegate, CurrentContext(), gfx::Rect(0, 0, 400, 400));
   widget->Show();
 
   aura::Window* parent = widget->GetNativeView();
   EXPECT_TRUE(wm::IsActiveWindow(parent));
 
   aura::Window* modal_parent = delegate->GetModalParent();
   EXPECT_NE(static_cast<aura::Window*>(NULL), modal_parent);
   EXPECT_NE(parent, modal_parent);
   EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
 
@@ skipping 36 matching lines @@
   EXPECT_FALSE(wm::IsActiveWindow(parent));
 
   EXPECT_TRUE(child->HasFocus());
   EXPECT_FALSE(modal_parent->HasFocus());
   EXPECT_FALSE(parent->HasFocus());
 }
 
 // Same as |ChildModal| test, but using |EventGenerator| rather than bypassing
 // it by calling |ActivateWindow|.
 TEST_F(WindowModalityControllerTest, ChildModalEventGenerator) {
-  views::test::ChildModalParent* delegate = new views::test::ChildModalParent;
-  views::Widget* widget = views::Widget::CreateWindowWithBounds(
-      delegate, gfx::Rect(0, 0, 400, 400));
+  views::test::ChildModalParent* delegate =
+      new views::test::ChildModalParent(CurrentContext());
+  views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
+      delegate, CurrentContext(), gfx::Rect(0, 0, 400, 400));
   widget->Show();
 
   aura::Window* parent = widget->GetNativeView();
   EXPECT_TRUE(wm::IsActiveWindow(parent));
 
   aura::Window* modal_parent = delegate->GetModalParent();
   EXPECT_NE(static_cast<aura::Window*>(NULL), modal_parent);
   EXPECT_NE(parent, modal_parent);
   EXPECT_FALSE(wm::IsActiveWindow(modal_parent));
 
@@ skipping 109 matching lines @@
 
   wm::ActivateWindow(w3.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w4.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 }
 
 }  // namespace internal
 }  // namespace ash