3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc
index 50c2cae..0bf1e28 100644
--- a/chrome/test/base/test_launcher_utils.cc
+++ b/chrome/test/base/test_launcher_utils.cc
@@ -52,7 +52,7 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
   // Disable window animations under Ash as the animations effect the
   // coordinates returned and result in flake.
   command_line->AppendSwitch(
-      wm::switches::kWindowAnimationsDisabled);
+      views::corewm::switches::kWindowAnimationsDisabled);
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index d8a1140..8ef02b5 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -96,7 +96,7 @@ void ViewEventTestBase::Done() {
 
 void ViewEventTestBase::SetUp() {
 #if defined(USE_AURA)
-  wm_state_.reset(new wm::WMState);
+  wm_state_.reset(new views::corewm::WMState);
 #endif
 
   views::ViewsDelegate::views_delegate = &views_delegate_;
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h
index 8c7e686..397c9ad 100644
--- a/chrome/test/base/view_event_test_base.h
+++ b/chrome/test/base/view_event_test_base.h
@@ -34,9 +34,11 @@ namespace gfx {
 class Size;
 }
 
-namespace wm {
+namespace views {
+namespace corewm {
 class WMState;
 }
+}
 
 // Base class for Views based tests that dispatch events.
 //
@@ -154,7 +156,7 @@ class ViewEventTestBase : public views::WidgetDelegate,
 
 #if defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
-  scoped_ptr<wm::WMState> wm_state_;
+  scoped_ptr<views::corewm::WMState> wm_state_;
 #endif
 
   ChromeViewsDelegate views_delegate_;