| 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 60d571e0c7042a30c553800d79437bcc6a177179..09dbbb1c2e5328960b2d725ed70176896d445ae3 100644
|
| --- a/ui/wm/core/shadow_controller_unittest.cc
|
| +++ b/ui/wm/core/shadow_controller_unittest.cc
|
| @@ -18,16 +18,17 @@
|
| #include "ui/wm/core/window_util.h"
|
| #include "ui/wm/core/wm_state.h"
|
| #include "ui/wm/public/activation_client.h"
|
| +#include "ui/wm/test/wm_test_base.h"
|
|
|
| namespace wm {
|
|
|
| -class ShadowControllerTest : public aura::test::AuraTestBase {
|
| +class ShadowControllerTest : public WMTestBase {
|
| public:
|
| ShadowControllerTest() {}
|
| virtual ~ShadowControllerTest() {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| - wm_state_.reset(new wm::WMState);
|
| + wm_state_.reset(new WMState);
|
| AuraTestBase::SetUp();
|
| aura::client::ActivationClient* activation_client =
|
| aura::client::GetActivationClient(root_window());
|
| @@ -51,7 +52,7 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
|
|
|
| private:
|
| scoped_ptr<ShadowController> shadow_controller_;
|
| - scoped_ptr<wm::WMState> wm_state_;
|
| + scoped_ptr<WMState> wm_state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShadowControllerTest);
|
| };
|
|
|