Move wm/core to wm namespace.

ui/wm/core/transient_window_manager_unittest.cc

 // Copyright 2014 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 "ui/wm/core/transient_window_manager.h"
 
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/transient_window_observer.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/core/wm_state.h"
 
 using aura::Window;
 
 using aura::test::ChildWindowIDsAsString;
 using aura::test::CreateTestWindowWithId;
 
-namespace views {
-namespace corewm {
+namespace wm {
 
 class TestTransientWindowObserver : public TransientWindowObserver {
  public:
   TestTransientWindowObserver() : add_count_(0), remove_count_(0) {
   }
 
   virtual ~TestTransientWindowObserver() {
   }
 
   int add_count() const { return add_count_; }
@@ skipping 16 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestTransientWindowObserver);
 };
 
 class TransientWindowManagerTest : public aura::test::AuraTestBase {
  public:
   TransientWindowManagerTest() {}
   virtual ~TransientWindowManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AuraTestBase::SetUp();
-    wm_state_.reset(new views::corewm::WMState);
+    wm_state_.reset(new wm::WMState);
   }
 
   virtual void TearDown() OVERRIDE {
     wm_state_.reset();
     AuraTestBase::TearDown();
   }
 
  protected:
   // Creates a transient window that is transient to |parent|.
   Window* CreateTransientChild(int id, Window* parent) {
     Window* window = new Window(NULL);
     window->set_id(id);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(aura::WINDOW_LAYER_TEXTURED);
     aura::client::ParentWindowWithContext(window, root_window(), gfx::Rect());
     AddTransientChild(parent, window);
     return window;
   }
 
  private:
-  scoped_ptr<views::corewm::WMState> wm_state_;
+  scoped_ptr<wm::WMState> wm_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TransientWindowManagerTest);
 };
 
 // Various assertions for transient children.
 TEST_F(TransientWindowManagerTest, TransientChildren) {
   scoped_ptr<Window> parent(CreateTestWindowWithId(0, root_window()));
   scoped_ptr<Window> w1(CreateTestWindowWithId(1, parent.get()));
   scoped_ptr<Window> w3(CreateTestWindowWithId(3, parent.get()));
   Window* w2 = CreateTestWindowWithId(2, parent.get());
@@ skipping 535 matching lines @@
   EXPECT_EQ(1, test_observer.add_count());
   EXPECT_EQ(0, test_observer.remove_count());
 
   RemoveTransientChild(parent.get(), w1.get());
   EXPECT_EQ(1, test_observer.add_count());
   EXPECT_EQ(1, test_observer.remove_count());
 
   TransientWindowManager::Get(parent.get())->RemoveObserver(&test_observer);
 }
 
-}  // namespace corewm
-}  // namespace views
+}  // namespace wm