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

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

Issue 557833007: Remove Increment/DecrementKeepAliveCount from AppsClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass ScopedKeepAlive Created 6 years, 3 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 fe9540528181593ac23de7d272e09fd9d7ad4f39..65dacecf210969462a0c8b4c315e4156ce643aab 100644
--- a/chrome/browser/apps/app_browsertest_util.cc
+++ b/chrome/browser/apps/app_browsertest_util.cc
@@ -6,6 +6,7 @@
#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/ui/apps/chrome_app_delegate.h"
@@ -201,7 +202,9 @@ AppWindow* PlatformAppBrowserTest::CreateAppWindowFromParams(
const Extension* extension,
const AppWindow::CreateParams& params) {
AppWindow* window =
- new AppWindow(browser()->profile(), new ChromeAppDelegate(), extension);
+ new AppWindow(browser()->profile(),
+ new ChromeAppDelegate(scoped_ptr<ScopedKeepAlive>()),
tapted 2014/09/24 07:12:41 to maintain behaviour in tests, I think this shoul
hashimoto 2014/09/24 09:03:46 Done.
+ extension);
window->Init(GURL(std::string()), new AppWindowContentsImpl(window), params);
return window;
}

Powered by Google App Engine
This is Rietveld 408576698