Add ScopedKeepAlive to c/b/lifetime

chrome/browser/apps/app_browsertest_util.cc

 // Copyright 2013 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/apps/app_browsertest_util.h"
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/app_window_contents.h"
@@ skipping 175 matching lines @@
       .size();
 }
 
 AppWindow* PlatformAppBrowserTest::CreateAppWindow(const Extension* extension) {
   return CreateAppWindowFromParams(extension, AppWindow::CreateParams());
 }
 
 AppWindow* PlatformAppBrowserTest::CreateAppWindowFromParams(
     const Extension* extension,
     const AppWindow::CreateParams& params) {
-  AppWindow* window =
-      new AppWindow(browser()->profile(),
-                    new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),
-                    extension);
+  AppWindow* window = new AppWindow(browser()->profile(),
+                                    new ChromeAppDelegate(true), extension);
   window->Init(GURL(std::string()), new AppWindowContentsImpl(window), params);
   return window;
 }
 
 void PlatformAppBrowserTest::CloseAppWindow(AppWindow* window) {
   content::WebContentsDestroyedWatcher destroyed_watcher(
       window->web_contents());
   window->GetBaseWindow()->Close();
   destroyed_watcher.Wait();
 }
@@ skipping 34 matching lines @@
   return app_window;
 }
 
 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   PlatformAppBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }
 
 }  // namespace extensions