No longer start BG mode until a BackgroundContents is loaded

chrome/browser/background/background_mode_manager.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 245 matching lines @@
     Profile* profile,
     const Extension* extension) {
   ExtensionService* service = profile->GetExtensionService();
   extension_misc::LaunchContainer launch_container =
       service->extension_prefs()->GetLaunchContainer(
           extension, ExtensionPrefs::LAUNCH_REGULAR);
   Browser::OpenApplication(profile, extension, launch_container, GURL(),
                            NEW_FOREGROUND_TAB);
 }
 
+bool BackgroundModeManager::IsBackgroundModeActiveForTest() {
+  return in_background_mode_;
+}
+
 int BackgroundModeManager::NumberOfBackgroundModeData() {
   return background_mode_data_.size();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, content::NotificationObserver overrides
 void BackgroundModeManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PREF_CHANGED:
       DCHECK(*content::Details<std::string>(details).ptr() ==
              prefs::kBackgroundModeEnabled);
       if (IsBackgroundModePrefEnabled())
         EnableBackgroundMode();
       else
         DisableBackgroundMode();
       break;
     case chrome::NOTIFICATION_EXTENSIONS_READY:
       // Extensions are loaded, so we don't need to manually keep the browser
       // process alive any more when running in no-startup-window mode.
       EndKeepAliveForStartup();
       break;
 
     case chrome::NOTIFICATION_EXTENSION_LOADED: {
         Extension* extension = content::Details<Extension>(details).ptr();
-        if (BackgroundApplicationListModel::IsBackgroundApp(*extension)) {
+        Profile* profile = content::Source<Profile>(source).ptr();
+        if (BackgroundApplicationListModel::IsBackgroundApp(
+                *extension, profile)) {
           // Extensions loaded after the ExtensionsService is ready should be
           // treated as new installs.
-          Profile* profile = content::Source<Profile>(source).ptr();
           if (profile->GetExtensionService()->is_ready())
             OnBackgroundAppInstalled(extension);
         }
       }
       break;
     case chrome::NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED: {
         UpdatedExtensionPermissionsInfo* info =
             content::Details<UpdatedExtensionPermissionsInfo>(details).ptr();
         if (info->permissions->HasAPIPermission(
                 ExtensionAPIPermission::kBackground) &&
@@ skipping 223 matching lines @@
     return;
 
   // Mark ourselves as running in background mode.
   in_background_mode_ = true;
 
   // Put ourselves in KeepAlive mode and create a status tray icon.
   BrowserList::StartKeepAlive();
 
   // Display a status icon to exit Chrome.
   InitStatusTrayIcon();
+
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_BACKGROUND_MODE_CHANGED,
+      content::Source<BackgroundModeManager>(this),
+      content::Details<bool>(&in_background_mode_));
 }
 
 void BackgroundModeManager::InitStatusTrayIcon() {
   // Only initialize status tray icons for those profiles which actually
   // have a background app running.
   if (keep_alive_for_test_ || GetBackgroundAppCount() > 0) {
     CreateStatusTrayIcon();
   }
 }
 
 void BackgroundModeManager::EndBackgroundMode() {
   if (!in_background_mode_)
     return;
   in_background_mode_ = false;
 
   // End KeepAlive mode and blow away our status tray icon.
   BrowserList::EndKeepAlive();
 
   RemoveStatusTrayIcon();
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_BACKGROUND_MODE_CHANGED,
+      content::Source<BackgroundModeManager>(this),
+      content::Details<bool>(&in_background_mode_));
 }
 
 void BackgroundModeManager::EnableBackgroundMode() {
   DCHECK(IsBackgroundModePrefEnabled());
   // If background mode should be enabled, but isn't, turn it on.
   if (!in_background_mode_ &&
       (GetBackgroundAppCount() > 0 || keep_alive_for_test_)) {
     StartBackgroundMode();
     EnableLaunchOnStartup(true);
   }
@@ skipping 178 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }