Add ScopedKeepAlive to c/b/lifetime

chrome/browser/ui/app_list/app_list_view_delegate.cc

Index: chrome/browser/ui/app_list/app_list_view_delegate.cc
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index f5338e737f069b0518b450ef7a2e18581ca992cc..ec6a3cbae68bfb048ed39766cf568cc3aebacce5 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -16,9 +16,9 @@
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
-#include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -350,8 +350,8 @@ void AppListViewDelegate::SetUpCustomLauncherPages() {
     std::string extension_id = it->host();
     apps::CustomLauncherPageContents* page_contents =
         new apps::CustomLauncherPageContents(
-            scoped_ptr<extensions::AppDelegate>(
-                new ChromeAppDelegate(scoped_ptr<ScopedKeepAlive>())),

[Bernhard Bauer, 2016/02/19 17:39:28]

Urr, this was a null pointer, no? (I.e. no keep alive)

[dgn, 2016/02/19 18:04:28]

Done in Patch 4

+            scoped_ptr<extensions::AppDelegate>(new ChromeAppDelegate(

[Bernhard Bauer, 2016/02/19 17:39:28]

Y'know, I'm thinking that ChromeAppDelegate should be what creates the
ScopedKeepAlive, and it should instead just take a boolean that says whether to
keep the browser alive or not.

[dgn, 2016/02/19 19:14:23]

Hum.. what about the optimization flags in that case?

[dgn, 2016/02/22 18:01:19]

Done.

+                make_scoped_ptr(new ScopedKeepAlive("ChromeAppDelegate")))),
             extension_id);
     page_contents->Initialize(profile_, *it);
     custom_page_contents_.push_back(page_contents);