Add ScopedKeepAlive to c/b/lifetime

chrome/browser/ui/app_list/app_list_service_views.cc

 // Copyright 2014 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_service_views.h"
 
 #include <utility>
 
-#include "chrome/browser/apps/scoped_keep_alive.h"
+#include "chrome/browser/lifetime/keep_alive_options.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/app_list/views/contents_view.h"
 
+namespace {
+
+static const KeepAliveOptions g_keep_alive_options = {"AppListServiceViews"};

[Bernhard Bauer, 2016/02/22 18:19:38]

Same as above. Also (as mentioned above), the anonymous namespace isn't really
necessary if you only have consts, so you could remove it (but OTOH, it doesn't
hurt either. I'm mostly mentioning this for completeness / education).

[dgn, 2016/02/22 19:07:19]

Thanks. Removed since there's nothing else in the anonymous namespace.

+
+}  // namespace
+
 AppListServiceViews::AppListServiceViews(
     scoped_ptr<AppListControllerDelegate> controller_delegate)
     : shower_(this),
       can_dismiss_(true),
       controller_delegate_(std::move(controller_delegate)) {}
 
 AppListServiceViews::~AppListServiceViews() {}
 
 void AppListServiceViews::OnViewBeingDestroyed() {
   can_dismiss_ = true;
@@ skipping 83 matching lines @@
 
 AppListViewDelegate* AppListServiceViews::GetViewDelegateForCreate() {
   return GetViewDelegate(shower_.profile());
 }
 
 void AppListServiceViews::ShowForProfileInternal(
     Profile* profile,
     app_list::AppListModel::State state) {
   DCHECK(profile);
 
-  ScopedKeepAlive keep_alive;
+  ScopedKeepAlive keep_alive(&g_keep_alive_options);
 
   CreateForProfile(profile);
 
   if (state != app_list::AppListModel::INVALID_STATE) {
     app_list::ContentsView* contents_view =
         shower_.app_list()->app_list_main_view()->contents_view();
     contents_view->SetActiveState(state,
                                  shower_.IsAppListVisible() /* animate */);
   }
 
   shower_.ShowForCurrentProfile();
   RecordAppListLaunch();
 }