| Index: ash/content/display/screen_orientation_controller_chromeos_unittest.cc
|
| diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
|
| index 90df6ec72279f2b81381a81dab23718d74a02778..0ca4e183d37d0026c1d4ef514757aa79a9f427d1 100644
|
| --- a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
|
| +++ b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
|
| @@ -22,7 +22,6 @@
|
| #include "ash/test/test_system_tray_delegate.h"
|
| #include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| #include "ash/wm/window_state.h"
|
| -#include "ash/wm_window.h"
|
| #include "base/command_line.h"
|
| #include "chromeos/accelerometer/accelerometer_reader.h"
|
| #include "chromeos/accelerometer/accelerometer_types.h"
|
| @@ -30,6 +29,7 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/test/test_browser_context.h"
|
| #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
|
| +#include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/display/display.h"
|
| #include "ui/display/display_switches.h"
|
| @@ -132,7 +132,8 @@ class ScreenOrientationControllerTest : public test::AshTestBase {
|
| protected:
|
| aura::Window* CreateAppWindowInShellWithId(int id) {
|
| aura::Window* window = CreateTestWindowInShellWithId(id);
|
| - WmWindow::Get(window)->SetAppType(static_cast<int>(AppType::CHROME_APP));
|
| + window->SetProperty(aura::client::kAppType,
|
| + static_cast<int>(AppType::CHROME_APP));
|
| return window;
|
| }
|
|
|
|
|