Revert "Move wm/core to wm namespace."

This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675.

Broke gyp

BUG=

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

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

1 files changed, 5 insertions, 3 deletions

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);
 };