Eliminates all ash dependencies from WindowModalityController.

ash/test/child_modal_window.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/test/child_modal_window.h"
 
 #include "ash/wm/window_modality_controller.h"
 #include "base/utf_string_conversions.h"  // ASCIIToUTF16
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
@@ skipping 129 matching lines @@
 
 gfx::NativeWindow ChildModalParent::GetChild() const {
   if (child_)
     return child_->GetNativeView();
   return NULL;
 }
 
 views::Widget* ChildModalParent::CreateChild() {
   views::Widget* child = views::Widget::CreateWindowWithParent(
       new ChildModalWindow, GetWidget()->GetNativeView());
-  ash::wm::SetModalParent(child->GetNativeView(), GetModalParent());
+  ash::SetModalParent(child->GetNativeView(), GetModalParent());
   child->AddObserver(this);
   child->GetNativeView()->SetName("ChildModalWindow");
   return child;
 }
 
 views::View* ChildModalParent::GetContentsView() {
   return this;
 }
 
 string16 ChildModalParent::GetWindowTitle() const {
@@ skipping 44 matching lines @@
 
 void ChildModalParent::OnWidgetClosing(views::Widget* widget) {
   if (child_) {
     DCHECK_EQ(child_, widget);
     child_ = NULL;
   }
 }
 
 }  // namespace test
 }  // namespace ash