Eliminates all ash dependencies from WindowModalityController.

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 "ash/wm/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/capture_tracking_view.h"
 #include "ash/test/child_modal_window.h"
@@ skipping 201 matching lines @@
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w11(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w1.get()));
   scoped_ptr<aura::Window> w2(
       CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w2->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
   aura::Window* wt;
-  wt = wm::GetModalTransient(w1.get());
+  wt = GetModalTransient(w1.get());
   ASSERT_EQ(static_cast<aura::Window*>(NULL), wt);
 
   // Parent w2 to w1. It should get parented to the parent of w1.
   w1->AddTransientChild(w2.get());
   ASSERT_EQ(2U, w1->parent()->children().size());
   EXPECT_EQ(-2, w1->parent()->children().at(1)->id());
 
   // Request the modal transient window for w1, it should be w2.
-  wt = wm::GetModalTransient(w1.get());
+  wt = GetModalTransient(w1.get());
   ASSERT_NE(static_cast<aura::Window*>(NULL), wt);
   EXPECT_EQ(-2, wt->id());
 
   // Request the modal transient window for w11, it should also be w2.
-  wt = wm::GetModalTransient(w11.get());
+  wt = GetModalTransient(w11.get());
   ASSERT_NE(static_cast<aura::Window*>(NULL), wt);
   EXPECT_EQ(-2, wt->id());
 }
 
 // Verifies we generate a capture lost when showing a modal window.
 TEST_F(WindowModalityControllerTest, ChangeCapture) {
   views::Widget* widget = views::Widget::CreateWindow(NULL);
   scoped_ptr<aura::Window> widget_window(widget->GetNativeView());
   test::CaptureTrackingView* view = new test::CaptureTrackingView;
   widget->client_view()->AddChildView(view);
@@ skipping 105 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) {
-  ash::test::ChildModalParent* delegate = new ash::test::ChildModalParent;
+  test::ChildModalParent* delegate = new test::ChildModalParent;
   views::Widget* widget = views::Widget::CreateWindowWithBounds(
       delegate, 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);
@@ skipping 38 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) {
-  ash::test::ChildModalParent* delegate = new ash::test::ChildModalParent;
+  test::ChildModalParent* delegate = new test::ChildModalParent;
   views::Widget* widget = views::Widget::CreateWindowWithBounds(
       delegate, 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);
@@ skipping 93 matching lines @@
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(
       CreateTestWindowInShellWithDelegate(&d, -1, gfx::Rect()));
   scoped_ptr<aura::Window> w2(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w1.get()));
   scoped_ptr<aura::Window> w3(
       aura::test::CreateTestWindowWithDelegate(&d, -11, gfx::Rect(), w2.get()));
   scoped_ptr<aura::Window> w4(
       CreateTestWindowInShellWithDelegate(&d, -2, gfx::Rect()));
   w4->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_CHILD);
-  ash::wm::SetModalParent(w4.get(), w2.get());
+  SetModalParent(w4.get(), w2.get());
   w1->AddTransientChild(w4.get());
 
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
 
   wm::ActivateWindow(w2.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w3.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 
   wm::ActivateWindow(w4.get());
   EXPECT_TRUE(wm::IsActiveWindow(w4.get()));
 }
 
 }  // namespace internal
 }  // namespace ash