| Index: ui/wm/core/shadow_controller_unittest.cc
|
| diff --git a/ui/wm/core/shadow_controller_unittest.cc b/ui/wm/core/shadow_controller_unittest.cc
|
| index 057f2b2837d77849c7cf58aec19d41884248a2a9..3f31b2ffd5f6f1f7fc202746c2b882676375f08d 100644
|
| --- a/ui/wm/core/shadow_controller_unittest.cc
|
| +++ b/ui/wm/core/shadow_controller_unittest.cc
|
| @@ -19,8 +19,7 @@
|
| #include "ui/wm/core/window_util.h"
|
| #include "ui/wm/core/wm_state.h"
|
|
|
| -namespace views {
|
| -namespace corewm {
|
| +namespace wm {
|
|
|
| class ShadowControllerTest : public aura::test::AuraTestBase {
|
| public:
|
| @@ -28,7 +27,7 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
|
| virtual ~ShadowControllerTest() {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| - wm_state_.reset(new views::corewm::WMState);
|
| + wm_state_.reset(new wm::WMState);
|
| AuraTestBase::SetUp();
|
| aura::client::ActivationClient* activation_client =
|
| aura::client::GetActivationClient(root_window());
|
| @@ -52,7 +51,7 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
|
|
|
| private:
|
| scoped_ptr<ShadowController> shadow_controller_;
|
| - scoped_ptr<views::corewm::WMState> wm_state_;
|
| + scoped_ptr<wm::WMState> wm_state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShadowControllerTest);
|
| };
|
| @@ -215,5 +214,4 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
|
| EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
|
| }
|
|
|
| -} // namespace corewm
|
| -} // namespace views
|
| +} // namespace wm
|
|
|