Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4279)

Unified Diff: chrome/browser/apps/app_browsertest_util.cc

Issue 1708343002: Add ScopedKeepAlive to c/b/lifetime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use singleton instead of browserprocess Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}
« no previous file with comments | « no previous file | chrome/browser/apps/scoped_keep_alive.h » ('j') | chrome/browser/background/background_mode_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698