Move wm/core to wm namespace.

Also sets up new targets for wm_core, wm_core_unittests, etc.

R=sky@chromium.org
TBR=sky@chromium.org
BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256839

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

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

3 files changed, 11 insertions, 11 deletions

diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc
index e9fb667..ffece4a 100644
--- a/ui/views/corewm/capture_controller_unittest.cc
+++ b/ui/views/corewm/capture_controller_unittest.cc
@@ -32,14 +32,14 @@ class CaptureControllerTest : public aura::test::AuraTestBase {
 
   virtual void SetUp() OVERRIDE {
     AuraTestBase::SetUp();
-    capture_controller_.reset(new corewm::ScopedCaptureClient(root_window()));
+    capture_controller_.reset(new wm::ScopedCaptureClient(root_window()));
 
     second_host_.reset(aura::WindowTreeHost::Create(gfx::Rect(0, 0, 800, 600)));
     second_host_->InitHost();
     second_host_->window()->Show();
     second_host_->SetBounds(gfx::Rect(800, 600));
     second_capture_controller_.reset(
-        new corewm::ScopedCaptureClient(second_host_->window()));
+        new wm::ScopedCaptureClient(second_host_->window()));
 
 #if !defined(OS_CHROMEOS)
     desktop_position_client_.reset(
@@ -77,9 +77,9 @@ class CaptureControllerTest : public aura::test::AuraTestBase {
     return second_capture_controller_->capture_client()->GetCaptureWindow();
   }
 
-  scoped_ptr<corewm::ScopedCaptureClient> capture_controller_;
+  scoped_ptr<wm::ScopedCaptureClient> capture_controller_;
   scoped_ptr<aura::WindowTreeHost> second_host_;
-  scoped_ptr<corewm::ScopedCaptureClient> second_capture_controller_;
+  scoped_ptr<wm::ScopedCaptureClient> second_capture_controller_;
 #if !defined(OS_CHROMEOS)
   scoped_ptr<aura::client::ScreenPositionClient> desktop_position_client_;
   scoped_ptr<aura::client::ScreenPositionClient>
diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc
index 0d42dc9..4a737b7 100644
--- a/ui/views/corewm/desktop_capture_controller_unittest.cc
+++ b/ui/views/corewm/desktop_capture_controller_unittest.cc
@@ -95,8 +95,8 @@ TEST_F(DesktopCaptureControllerTest, CaptureWindowInputEventTest) {
 
   scoped_ptr<Widget> widget1(new Widget());
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
-  scoped_ptr<corewm::ScopedCaptureClient> scoped_capture_client(
-      new corewm::ScopedCaptureClient(params.context->GetRootWindow()));
+  scoped_ptr<wm::ScopedCaptureClient> scoped_capture_client(
+      new wm::ScopedCaptureClient(params.context->GetRootWindow()));
   aura::client::CaptureClient* capture_client =
       scoped_capture_client->capture_client();
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
index 772ba33..39cab8e 100644
--- a/ui/views/corewm/tooltip_controller_unittest.cc
+++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -76,7 +76,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
   virtual ~TooltipControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
-    wm_state_.reset(new views::corewm::WMState);
+    wm_state_.reset(new wm::WMState);
     aura::test::AuraTestBase::SetUp();
 #if defined(OS_CHROMEOS)
     controller_.reset(new TooltipController(
@@ -137,7 +137,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
-  scoped_ptr<views::corewm::WMState> wm_state_;
+  scoped_ptr<wm::WMState> wm_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest);
 };
@@ -695,10 +695,10 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase {
   virtual ~TooltipControllerTest2() {}
 
   virtual void SetUp() OVERRIDE {
-    wm_state_.reset(new views::corewm::WMState);
+    wm_state_.reset(new wm::WMState);
     aura::test::AuraTestBase::SetUp();
     controller_.reset(new TooltipController(
-                          scoped_ptr<views::corewm::Tooltip>(test_tooltip_)));
+                          scoped_ptr<corewm::Tooltip>(test_tooltip_)));
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
     helper_.reset(new TooltipControllerTestHelper(controller_.get()));
@@ -723,7 +723,7 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase {
 
  private:
   scoped_ptr<TooltipController> controller_;
-  scoped_ptr<views::corewm::WMState> wm_state_;
+  scoped_ptr<wm::WMState> wm_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest2);
 };