Move wm/core to wm namespace.

ash/test/ash_test_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/test/display_manager_test_api.h"
@@ skipping 34 matching lines @@
   CHECK(message_loop_);
 #if defined(USE_X11)
   aura::test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
 }
 
 AshTestHelper::~AshTestHelper() {
 }
 
 void AshTestHelper::SetUp(bool start_session) {
-  wm_state_.reset(new views::corewm::WMState);
+  wm_state_.reset(new wm::WMState);
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   ui::InitializeInputMethodForTesting();
 
   bool enable_pixel_output = false;
   ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   // Creates Shell and hook with Desktop.
@@ skipping 53 matching lines @@
 
   aura::Env::DeleteInstance();
   ui::TerminateContextFactoryForTests();
 
   // Need to reset the initial login status.
   TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER);
 
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
-  CHECK(!views::corewm::ScopedCaptureClient::IsActive());
+  CHECK(!wm::ScopedCaptureClient::IsActive());
 
   wm_state_.reset();
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {
   DCHECK(base::MessageLoopForUI::current() == message_loop_);
   aura::Env::CreateInstance();
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 aura::Window* AshTestHelper::CurrentContext() {
   aura::Window* root_window = Shell::GetTargetRootWindow();
   if (!root_window)
     root_window = Shell::GetPrimaryRootWindow();
   DCHECK(root_window);
   return root_window;
 }
 
 }  // namespace test
 }  // namespace ash