Add ScopedKeepAlive to c/b/lifetime

chrome/browser/ui/app_list/app_list_shower_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_shower_views.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/apps/scoped_keep_alive.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_shower_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/screen.h"
 
 AppListShower::AppListShower(AppListShowerDelegate* delegate)
     : delegate_(delegate),
       profile_(NULL),
       app_list_(NULL),
       window_icon_updated_(false) {
 }
 
 AppListShower::~AppListShower() {
 }
 
 void AppListShower::ShowForCurrentProfile() {
   DCHECK(HasView());
-  keep_alive_.reset(new ScopedKeepAlive);
+  keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::APP_LIST_SHOWER));

[sky, 2016/02/25 18:43:50]

Ugh! What a name (I get that you're matching the class name, which is equally
bizarre).

[dgn, 2016/02/25 20:08:50]

Haha, I also had a double take while writing that.

 
   // If the app list is already displaying |profile| just activate it (in case
   // we have lost focus).
   if (!IsAppListVisible())
     delegate_->MoveNearCursor(app_list_);
 
   Show();
 }
 
 gfx::NativeWindow AppListShower::GetWindow() {
@@ skipping 106 matching lines @@
         FROM_HERE,
         base::Bind(&AppListShower::ResetKeepAlive, base::Unretained(this)));
     return;
   }
   ResetKeepAlive();
 }
 
 void AppListShower::ResetKeepAlive() {
   keep_alive_.reset();
 }