| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| index e10c9529c892ccb14df294e9848f83d62100a350..f2473eec3666d2ef6884b78386417baf70b9082b 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| @@ -49,10 +49,10 @@
|
| #if defined(OS_CHROMEOS)
|
| #include "ash/test/test_session_state_delegate.h"
|
| #include "ash/test/test_shell_delegate.h"
|
| -#include "chrome/browser/apps/scoped_keep_alive.h"
|
| #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
|
| #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
|
| #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
|
| +#include "chrome/browser/lifetime/browser_keep_alive.h"
|
| #include "chrome/browser/ui/apps/chrome_app_delegate.h"
|
| #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
|
| #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
|
| @@ -728,8 +728,8 @@ class V2App {
|
| public:
|
| V2App(Profile* profile, const extensions::Extension* extension) {
|
| window_ = new extensions::AppWindow(
|
| - profile,
|
| - new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),
|
| + profile, new ChromeAppDelegate(
|
| + make_scoped_ptr(new browser_lifetime::ScopedKeepAlive)),
|
| extension);
|
| extensions::AppWindow::CreateParams params =
|
| extensions::AppWindow::CreateParams();
|
|
|