No longer start BG mode until a BackgroundContents is loaded

chrome/browser/background/background_mode_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
 #define CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
 #pragma once
 
 #include <map>
 
@@ skipping 27 matching lines @@
 //
 // When Chrome is in background mode, it will continue running even after the
 // last browser window is closed, until the user explicitly exits the app.
 // Additionally, when in background mode, Chrome will launch on OS login with
 // no open windows to allow apps with the "background" permission to run in the
 // background.
 class BackgroundModeManager
     : public content::NotificationObserver,
       public BackgroundApplicationListModel::Observer,
       public ProfileInfoCacheObserver,
-      public ProfileKeyedService,
       public ui::SimpleMenuModel::Delegate {
  public:
   BackgroundModeManager(CommandLine* command_line,
                         ProfileInfoCache* profile_cache);
   virtual ~BackgroundModeManager();
 
   static void RegisterPrefs(PrefService* prefs);
 
   virtual void RegisterProfile(Profile* profile);
 
   static void LaunchBackgroundApplication(Profile* profile,
                                           const Extension* extension);
 
+  // Returns true if background mode is active. Used only by tests.
+  bool IsBackgroundModeActiveForTest();
+
   // For testing purposes.
   int NumberOfBackgroundModeData();
 
  private:
+  friend class AppBackgroundPageApiTest;

[Mihai Parparita -not on Chrome, 2012/05/03 00:54:11]

Given this friend declaration, does IsBackgroundModeActiveForTest need to be
public?

[Andrew T Wilson (Slow), 2012/05/03 07:42:56]

Agreed, it can be private.

+  friend class BackgroundModeManagerTest;
   friend class TestBackgroundModeManager;
-  friend class BackgroundModeManagerTest;
   FRIEND_TEST_ALL_PREFIXES(BackgroundModeManagerTest,
                            BackgroundAppLoadUnload);
   FRIEND_TEST_ALL_PREFIXES(BackgroundModeManagerTest,
                            BackgroundLaunchOnStartup);
   FRIEND_TEST_ALL_PREFIXES(BackgroundModeManagerTest,
                            BackgroundAppInstallUninstallWhileDisabled);
   FRIEND_TEST_ALL_PREFIXES(BackgroundModeManagerTest,
                            EnableAfterBackgroundAppInstall);
   FRIEND_TEST_ALL_PREFIXES(BackgroundModeManagerTest,
                            MultiProfile);
@@ skipping 210 matching lines @@
   // app).
   bool keep_alive_for_test_;
 
   // Provides a command id for each profile as they are created.
   int current_command_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundModeManager);
 };
 
 #endif  // CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_