Revert "Move wm/core to wm namespace."

This reverts commit 067d7fe616a07011b9e2d2609fc65af8db6a7dfb.

Broke the build:
http://build.chromium.org/p/chromium.mac/builders/Mac%20Builder%20%28dbg%29/builds/63598/steps/compile/logs/stdio

BUG=
TBR=ben

Review URL: https://codereview.chromium.org/198283002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256686 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 18 insertions, 12 deletions

diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 33dbb83..50e9841 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -52,7 +52,7 @@ AshTestHelper::~AshTestHelper() {
 }
 
 void AshTestHelper::SetUp(bool start_session) {
-  wm_state_.reset(new wm::WMState);
+  wm_state_.reset(new views::corewm::WMState);
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
@@ -126,7 +126,7 @@ void AshTestHelper::TearDown() {
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
-  CHECK(!wm::ScopedCaptureClient::IsActive());
+  CHECK(!views::corewm::ScopedCaptureClient::IsActive());
 
   wm_state_.reset();
 }
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index a1974cb..706cfeb 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -20,9 +20,11 @@ namespace ui {
 class ScopedAnimationDurationScaleMode;
 }  // namespace ui
 
-namespace wm {
+namespace views {
+namespace corewm {
 class WMState;
 }
+}
 
 namespace ash {
 namespace test {
@@ -66,7 +68,7 @@ class AshTestHelper {
   // Owned by ash::AcceleratorController
   TestScreenshotDelegate* test_screenshot_delegate_;
 
-  scoped_ptr<wm::WMState> wm_state_;
+  scoped_ptr<views::corewm::WMState> wm_state_;
 
   // Check if DBus Thread Manager was initialized here.
   bool dbus_thread_manager_initialized_;
diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc
index 0b7711b9..b4c289a 100644
--- a/ash/test/cursor_manager_test_api.cc
+++ b/ash/test/cursor_manager_test_api.cc
@@ -15,7 +15,7 @@ namespace ash {
 namespace test {
 
 CursorManagerTestApi::CursorManagerTestApi(
-    wm::CursorManager* cursor_manager)
+    views::corewm::CursorManager* cursor_manager)
     : cursor_manager_(cursor_manager) {
 }
 
diff --git a/ash/test/cursor_manager_test_api.h b/ash/test/cursor_manager_test_api.h
index d368216..9cffac5 100644
--- a/ash/test/cursor_manager_test_api.h
+++ b/ash/test/cursor_manager_test_api.h
@@ -13,9 +13,11 @@ namespace gfx {
 class Display;
 }
 
-namespace wm {
+namespace views {
+namespace corewm {
 class CursorManager;
 }
+}
 
 namespace ash {
 namespace test {
@@ -23,7 +25,7 @@ namespace test {
 // Use the api in this class to test CursorManager.
 class CursorManagerTestApi {
  public:
-  explicit CursorManagerTestApi(::wm::CursorManager* cursor_manager);
+  explicit CursorManagerTestApi(views::corewm::CursorManager* cursor_manager);
   ~CursorManagerTestApi();
 
   float GetCurrentScale() const;
@@ -32,7 +34,7 @@ class CursorManagerTestApi {
   gfx::Display GetDisplay() const;
 
  private:
-  ::wm::CursorManager* cursor_manager_;
+  views::corewm::CursorManager* cursor_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorManagerTestApi);
 };
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index 5d2ec11..07efa52 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -22,7 +22,7 @@ internal::RootWindowLayoutManager* ShellTestApi::root_window_layout() {
   return shell_->GetPrimaryRootWindowController()->root_window_layout();
 }
 
-wm::InputMethodEventFilter*
+views::corewm::InputMethodEventFilter*
 ShellTestApi::input_method_event_filter() {
   return shell_->input_method_filter_.get();
 }
diff --git a/ash/test/shell_test_api.h b/ash/test/shell_test_api.h
index 12e40b7..7306b3d 100644
--- a/ash/test/shell_test_api.h
+++ b/ash/test/shell_test_api.h
@@ -7,9 +7,11 @@
 
 #include "base/basictypes.h"
 
-namespace wm {
+namespace views {
+namespace corewm {
 class InputMethodEventFilter;
-}  // namespace wm
+}  // namespace corewm
+}  // namespace views
 
 namespace ash {
 class AshNativeCursorManager;
@@ -35,7 +37,7 @@ public:
   explicit ShellTestApi(Shell* shell);
 
   internal::RootWindowLayoutManager* root_window_layout();
-  ::wm::InputMethodEventFilter* input_method_event_filter();
+  views::corewm::InputMethodEventFilter* input_method_event_filter();
   internal::SystemGestureEventFilter* system_gesture_event_filter();
   internal::WorkspaceController* workspace_controller();
   internal::ScreenPositionController* screen_position_controller();