Continue threading context through unit tests.

ash/root_window_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 "ash/root_window_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 58 matching lines @@
                                aura::Window* lost_focus) OVERRIDE {
     if (window_ == lost_focus)
       delete window_;
   }
 
   aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(DeleteOnBlurDelegate);
 };
 
-views::Widget* CreateTestWidget(const gfx::Rect& bounds) {
-  views::Widget* widget =
-      views::Widget::CreateWindowWithBounds(NULL, bounds);
-  widget->Show();
-  return widget;
-}
-
-views::Widget* CreateModalWidget(const gfx::Rect& bounds) {
-  views::Widget* widget =
-      views::Widget::CreateWindowWithBounds(new TestDelegate(true), bounds);
-  widget->Show();
-  return widget;
-}
-
-views::Widget* CreateModalWidgetWithParent(const gfx::Rect& bounds,
-                                           gfx::NativeWindow parent) {
-  views::Widget* widget =
-      views::Widget::CreateWindowWithParentAndBounds(new TestDelegate(true),
-                                                     parent,
-                                                     bounds);
-  widget->Show();
-  return widget;
-}
-
-aura::Window* GetModalContainer(aura::RootWindow* root_window) {
-  return Shell::GetContainer(
-      root_window,
-      ash::internal::kShellWindowId_SystemModalContainer);
-}
-
 }  // namespace
 
 namespace test {
 
-typedef test::AshTestBase RootWindowControllerTest;
+class RootWindowControllerTest : public test::AshTestBase {
+ public:
+  views::Widget* CreateTestWidget(const gfx::Rect& bounds) {
+    views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
+        NULL, CurrentContext(), bounds);
+    widget->Show();
+    return widget;
+  }
+
+  views::Widget* CreateModalWidget(const gfx::Rect& bounds) {
+    views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
+        new TestDelegate(true), CurrentContext(), bounds);
+    widget->Show();
+    return widget;
+  }
+
+  views::Widget* CreateModalWidgetWithParent(const gfx::Rect& bounds,
+                                             gfx::NativeWindow parent) {
+    views::Widget* widget =
+        views::Widget::CreateWindowWithParentAndBounds(new TestDelegate(true),
+                                                       parent,
+                                                       bounds);
+    widget->Show();
+    return widget;
+  }
+
+  aura::Window* GetModalContainer(aura::RootWindow* root_window) {
+    return Shell::GetContainer(
+        root_window,
+        ash::internal::kShellWindowId_SystemModalContainer);
+  }
+};
 
 TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
   UpdateDisplay("600x600,500x500");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   internal::RootWindowController* controller =
       Shell::GetPrimaryRootWindowController();
   controller->SetShelfAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100));
   EXPECT_EQ(root_windows[1], normal->GetNativeView()->GetRootWindow());
@@ skipping 189 matching lines @@
   views::Widget* session_modal_widget =
         CreateModalWidget(gfx::Rect(300, 10, 100, 100));
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
       internal::kShellWindowId_SystemModalContainer)->layout_manager(),
           controller->GetSystemModalLayoutManager(
               session_modal_widget->GetNativeView()));
 }
 
 }  // namespace test
 }  // namespace ash