diff options
Diffstat (limited to 'chrome/browser/chromeos/policy/device_local_account_browsertest.cc')
-rw-r--r-- | chrome/browser/chromeos/policy/device_local_account_browsertest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 5cf0f9b..89e9898 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -7,8 +7,6 @@ #include <string> #include <vector> -#include "apps/app_window.h" -#include "apps/app_window_registry.h" #include "ash/shell.h" #include "ash/system/chromeos/session/logout_confirmation_controller.h" #include "ash/system/chromeos/session/logout_confirmation_dialog.h" @@ -114,6 +112,8 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "crypto/rsa_private_key.h" +#include "extensions/browser/app_window/app_window.h" +#include "extensions/browser/app_window/app_window_registry.h" #include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" @@ -386,7 +386,7 @@ bool IsSessionStarted() { class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, public user_manager::UserManager::Observer, public chrome::BrowserListObserver, - public apps::AppWindowRegistry::Observer { + public extensions::AppWindowRegistry::Observer { protected: DeviceLocalAccountTest() : user_id_1_(GenerateDeviceLocalAccountUserId( @@ -520,12 +520,12 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, run_loop_->Quit(); } - virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE { + virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE { if (run_loop_) run_loop_->Quit(); } - virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE { + virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE { if (run_loop_) run_loop_->Quit(); } @@ -1287,8 +1287,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, LastWindowClosedLogoutReminder) { Profile* profile = GetProfileForTest(); ASSERT_TRUE(profile); - apps::AppWindowRegistry* app_window_registry = - apps::AppWindowRegistry::Get(profile); + extensions::AppWindowRegistry* app_window_registry = + extensions::AppWindowRegistry::Get(profile); app_window_registry->AddObserver(this); // Verify that the logout confirmation dialog is not showing. |