Add ScopedKeepAlive to c/b/lifetime

chrome/browser/ui/views/profiles/user_manager_view.cc

Index: chrome/browser/ui/views/profiles/user_manager_view.cc
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc
index 87d56b97a998d84998ad4d599b2e1cf3db40c78b..e79a975fc4fea5b887c0c8a61927866383fabb62 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -9,7 +9,8 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
@@ -21,7 +22,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/user_manager.h"
-#include "chrome/browser/ui/views/auto_keep_alive.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ -234,8 +234,8 @@ void UserManager::ShowReauthDialog(content::BrowserContext* browser_context,
 
 UserManagerView::UserManagerView()
     : web_view_(NULL),
-      keep_alive_(new AutoKeepAlive(NULL)),
       user_manager_started_showing_(base::Time()) {
+  keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::USER_MANAGER_VIEW));

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

I think you want !USE_ASH here too. The reason is that AutoKeepAlive(NULL) only
did something if not on ash.

[dgn, 2016/02/26 11:51:59]

Done.

 }
 
 UserManagerView::~UserManagerView() {