| Index: chrome/browser/apps/app_browsertest_util.cc
|
| diff --git a/chrome/browser/apps/app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc
|
| index 3cfc59465ea2614220cf723fc7be5e23d77edeba..9e65f7558768f82d5598396b20422d7700eeaa56 100644
|
| --- a/chrome/browser/apps/app_browsertest_util.cc
|
| +++ b/chrome/browser/apps/app_browsertest_util.cc
|
| @@ -6,9 +6,9 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/strings/stringprintf.h"
|
| -#include "chrome/browser/apps/scoped_keep_alive.h"
|
| #include "chrome/browser/extensions/api/tabs/tabs_api.h"
|
| #include "chrome/browser/extensions/extension_function_test_utils.h"
|
| +#include "chrome/browser/lifetime/scoped_keep_alive.h"
|
| #include "chrome/browser/ui/apps/chrome_app_delegate.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/extensions/app_launch_params.h"
|
| @@ -202,10 +202,10 @@ AppWindow* PlatformAppBrowserTest::CreateAppWindow(const Extension* extension) {
|
| AppWindow* PlatformAppBrowserTest::CreateAppWindowFromParams(
|
| const Extension* extension,
|
| const AppWindow::CreateParams& params) {
|
| - AppWindow* window =
|
| - new AppWindow(browser()->profile(),
|
| - new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),
|
| - extension);
|
| + AppWindow* window = new AppWindow(
|
| + browser()->profile(), new ChromeAppDelegate(make_scoped_ptr(
|
| + new ScopedKeepAlive("ChromeAppDelegate"))),
|
| + extension);
|
| window->Init(GURL(std::string()), new AppWindowContentsImpl(window), params);
|
| return window;
|
| }
|
|
|