Remove Increment/DecrementKeepAliveCount from AppsClient

chrome/browser/ui/apps/chrome_app_delegate.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/apps/chrome_app_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
+#include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ skipping 121 matching lines @@
                                                         params));
     // Object lifetime notes: The OpenURLFromTabBasedOnBrowserDefault is owned
     // by check_if_default_browser_worker. StartCheckIsDefault() takes lifetime
     // ownership of check_if_default_browser_worker and will clean up after
     // the asynchronous tasks.
     check_if_default_browser_worker->StartCheckIsDefault();
   }
   return NULL;
 }
 
-ChromeAppDelegate::ChromeAppDelegate()
-    : new_window_contents_delegate_(new NewWindowContentsDelegate()) {
+ChromeAppDelegate::ChromeAppDelegate(scoped_ptr<ScopedKeepAlive> keep_alive)
+    : keep_alive_(keep_alive.Pass()),
+      new_window_contents_delegate_(new NewWindowContentsDelegate()) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 }
 
 ChromeAppDelegate::~ChromeAppDelegate() {
+  // Unregister now to prevent getting notified if |keep_alive_| is the last.
+  terminating_callback_.Reset();
 }
 
 void ChromeAppDelegate::DisableExternalOpenForTesting() {
   disable_external_open_for_testing_ = true;
 }
 
 void ChromeAppDelegate::InitWebContents(content::WebContents* web_contents) {
   FaviconTabHelper::CreateForWebContents(web_contents);
 
 #if defined(ENABLE_PRINTING)
@@ skipping 117 matching lines @@
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_APP_TERMINATING:
       if (!terminating_callback_.is_null())
         terminating_callback_.Run();
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }