5 files changed, 15 insertions, 20 deletions
diff --git a/ui/views/test/child_modal_window.cc b/ui/views/test/child_modal_window.cc
index 2292fd6..c5d40ad 100644
--- a/ui/views/test/child_modal_window.cc
+++ b/ui/views/test/child_modal_window.cc
@@ -150,7 +150,7 @@ gfx::NativeWindow ChildModalParent::GetChild() const {
 Widget* ChildModalParent::CreateChild() {
   Widget* child = Widget::CreateWindowWithParent(
       new ChildModalWindow, GetWidget()->GetNativeView());
-  wm::SetModalParent(child->GetNativeView(), GetModalParent());
+  corewm::SetModalParent(child->GetNativeView(), GetModalParent());
   child->AddObserver(this);
   child->GetNativeView()->SetName("ChildModalWindow");
   return child;
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index 47c1d66..6caae1d 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -20,7 +20,7 @@ TestViewsDelegate::TestViewsDelegate()
     : use_transparent_windows_(false) {
   DCHECK(!ViewsDelegate::views_delegate);
   ViewsDelegate::views_delegate = this;
-  wm_state_.reset(new wm::WMState);
+  wm_state_.reset(new views::corewm::WMState);
 }
 
 TestViewsDelegate::~TestViewsDelegate() {
diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h
index 3642160..deaab99 100644
--- a/ui/views/test/test_views_delegate.h
+++ b/ui/views/test/test_views_delegate.h
@@ -16,14 +16,14 @@ namespace ui {
 class Clipboard;
 }
 
-namespace wm {
-class WMState;
-}
-
 namespace views {
 class View;
 class Widget;
 
+namespace corewm {
+class WMState;
+}
+
 class TestViewsDelegate : public ViewsDelegate {
  public:
   TestViewsDelegate();
@@ -76,7 +76,7 @@ class TestViewsDelegate : public ViewsDelegate {
  private:
   bool use_transparent_windows_;
 
-  scoped_ptr<wm::WMState> wm_state_;
+  scoped_ptr<views::corewm::WMState> wm_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index 4bf036c..7929f9a 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -25,7 +25,7 @@ ViewsTestBase::~ViewsTestBase() {
   CHECK(setup_called_)
       << "You have overridden SetUp but never called super class's SetUp";
   CHECK(teardown_called_)
-      << "You have overridden TearDown but never called super class's TearDown";
+      << "You have overrideen TearDown but never called super class's TearDown";
 }
 
 void ViewsTestBase::SetUp() {
@@ -39,7 +39,7 @@ void ViewsTestBase::SetUp() {
 
   aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
   aura_test_helper_->SetUp();
-  wm_state_.reset(new ::wm::WMState);
+  wm_state_.reset(new views::corewm::WMState);
   ui::InitializeInputMethodForTesting();
 }
 
@@ -56,7 +56,7 @@ void ViewsTestBase::TearDown() {
   aura_test_helper_->TearDown();
   ui::TerminateContextFactoryForTests();
   wm_state_.reset();
-  CHECK(!wm::ScopedCaptureClient::IsActive());
+  CHECK(!corewm::ScopedCaptureClient::IsActive());
 }
 
 void ViewsTestBase::RunPendingMessages() {
diff --git a/ui/views/test/views_test_base.h b/ui/views/test/views_test_base.h
index 1e7c8df..dd08f4a 100644
--- a/ui/views/test/views_test_base.h
+++ b/ui/views/test/views_test_base.h
@@ -14,6 +14,10 @@
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
+namespace ui {
+class EventProcessor;
+}
+
 namespace aura {
 class WindowTreeHost;
 namespace test {
@@ -21,15 +25,6 @@ class AuraTestHelper;
 }
 }
 
-namespace ui {
-class EventProcessor;
-}
-
-namespace wm {
-class WMState;
-}
-
-
 namespace views {
 
 // A base class for views unit test. It creates a message loop necessary
@@ -69,7 +64,7 @@ class ViewsTestBase : public testing::Test {
   base::MessageLoopForUI message_loop_;
   scoped_ptr<TestViewsDelegate> views_delegate_;
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
-  scoped_ptr<wm::WMState> wm_state_;
+  scoped_ptr<views::corewm::WMState> wm_state_;
   bool setup_called_;
   bool teardown_called_;