Add ScopedKeepAlive to c/b/lifetime

chrome/browser/ui/app_list/app_list_view_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "apps/custom_launcher_page_contents.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/metrics/user_metrics.h"
 #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"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
@@ skipping 311 matching lines @@
   GetCustomLauncherPageUrls(profile_, &custom_launcher_page_urls);
   if (custom_launcher_page_urls.empty())
     return;
 
   for (std::vector<GURL>::const_iterator it = custom_launcher_page_urls.begin();
        it != custom_launcher_page_urls.end();
        ++it) {
     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);
   }
 
   std::string first_launcher_page_app_id = custom_launcher_page_urls[0].host();
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile_)
           ->GetExtensionById(first_launcher_page_app_id,
                              extensions::ExtensionRegistry::EVERYTHING);
@@ skipping 457 matching lines @@
 
       // SigninManagerFactory is not a leaky singleton (unlike this class), and
       // its destructor will check that it has no remaining observers.
       scoped_observer_.RemoveAll();
       SigninManagerFactory::GetInstance()->RemoveObserver(this);
       break;
     default:
       NOTREACHED();
   }
 }