No longer start BG mode until a BackgroundContents is loaded

chrome/browser/background/background_application_list_model_unittest.cc

Index: chrome/browser/background/background_application_list_model_unittest.cc
diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
index 2e8690ec3f37da2bdf953c610e5be0fb355b0c7b..fea9d20063a8856c18057f4795890dfae92f95f4 100644
--- a/chrome/browser/background/background_application_list_model_unittest.cc
+++ b/chrome/browser/background/background_application_list_model_unittest.cc
@@ -45,6 +45,11 @@ class BackgroundApplicationListModelTest : public ExtensionServiceTestBase {
     InitializeEmptyExtensionService();
     service_->OnLoadedInstalledExtensions(); /* Sends EXTENSIONS_READY */
   }
+
+  bool IsBackgroundApp(const Extension& app) {
+    return BackgroundApplicationListModel::IsBackgroundApp(app,
+                                                           profile_.get());
+  }
 };
 
 // Returns a barebones test Extension object with the specified |name|.  The
@@ -84,7 +89,10 @@ std::string GenerateUniqueExtensionName() {
 
 void AddBackgroundPermission(ExtensionService* service,
                              Extension* extension) {
-  if (BackgroundApplicationListModel::IsBackgroundApp(*extension)) return;
+  if (BackgroundApplicationListModel::IsBackgroundApp(*extension,
+                                                      service->profile())) {
+    return;
+  }
 
   static scoped_refptr<Extension> temporary =
       CreateExtension(GenerateUniqueExtensionName(), true);
@@ -96,7 +104,10 @@ void AddBackgroundPermission(ExtensionService* service,
 
 void RemoveBackgroundPermission(ExtensionService* service,
                                 Extension* extension) {
-  if (!BackgroundApplicationListModel::IsBackgroundApp(*extension)) return;
+  if (!BackgroundApplicationListModel::IsBackgroundApp(*extension,
+                                                       service->profile())) {
+    return;
+  }
   extensions::PermissionsUpdater(service->profile()).RemovePermissions(
       extension, extension->GetActivePermissions());
 }
@@ -125,45 +136,45 @@ TEST_F(BackgroundApplicationListModelTest, ExplicitTest) {
   ASSERT_EQ(0U, model->size());
 
   // Add alternating Extensions and Background Apps
-  ASSERT_FALSE(BackgroundApplicationListModel::IsBackgroundApp(*ext1));
+  ASSERT_FALSE(IsBackgroundApp(*ext1));
   service->AddExtension(ext1);
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
-  ASSERT_TRUE(BackgroundApplicationListModel::IsBackgroundApp(*bgapp1));
+  ASSERT_TRUE(IsBackgroundApp(*bgapp1));
   service->AddExtension(bgapp1);
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_FALSE(BackgroundApplicationListModel::IsBackgroundApp(*ext2));
+  ASSERT_FALSE(IsBackgroundApp(*ext2));
   service->AddExtension(ext2);
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_TRUE(BackgroundApplicationListModel::IsBackgroundApp(*bgapp2));
+  ASSERT_TRUE(IsBackgroundApp(*bgapp2));
   service->AddExtension(bgapp2);
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
-  ASSERT_FALSE(BackgroundApplicationListModel::IsBackgroundApp(*ext3));
+  ASSERT_FALSE(IsBackgroundApp(*ext3));
   service->AddExtension(ext3);
   ASSERT_EQ(5U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
 
   // Remove in FIFO order.
-  ASSERT_FALSE(BackgroundApplicationListModel::IsBackgroundApp(*ext1));
+  ASSERT_FALSE(IsBackgroundApp(*ext1));
   service->UninstallExtension(ext1->id(), false, NULL);
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
-  ASSERT_TRUE(BackgroundApplicationListModel::IsBackgroundApp(*bgapp1));
+  ASSERT_TRUE(IsBackgroundApp(*bgapp1));
   service->UninstallExtension(bgapp1->id(), false, NULL);
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_FALSE(BackgroundApplicationListModel::IsBackgroundApp(*ext2));
+  ASSERT_FALSE(IsBackgroundApp(*ext2));
   service->UninstallExtension(ext2->id(), false, NULL);
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
-  ASSERT_TRUE(BackgroundApplicationListModel::IsBackgroundApp(*bgapp2));
+  ASSERT_TRUE(IsBackgroundApp(*bgapp2));
   service->UninstallExtension(bgapp2->id(), false, NULL);
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
-  ASSERT_FALSE(BackgroundApplicationListModel::IsBackgroundApp(*ext3));
+  ASSERT_FALSE(IsBackgroundApp(*ext3));
   service->UninstallExtension(ext3->id(), false, NULL);
   ASSERT_EQ(0U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
@@ -188,11 +199,11 @@ TEST_F(BackgroundApplicationListModelTest, AddRemovePermissionsTest) {
   ASSERT_EQ(0U, model->size());
 
   // Add one (non-background) extension and one background application
-  ASSERT_FALSE(BackgroundApplicationListModel::IsBackgroundApp(*ext));
+  ASSERT_FALSE(IsBackgroundApp(*ext));
   service->AddExtension(ext);
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
-  ASSERT_TRUE(BackgroundApplicationListModel::IsBackgroundApp(*bgapp));
+  ASSERT_TRUE(IsBackgroundApp(*bgapp));
   service->AddExtension(bgapp);
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
@@ -227,7 +238,8 @@ void AddExtension(ExtensionService* service,
   }
   scoped_refptr<Extension> extension =
       CreateExtension(GenerateUniqueExtensionName(), create_background);
-  ASSERT_EQ(BackgroundApplicationListModel::IsBackgroundApp(*extension),
+  ASSERT_EQ(BackgroundApplicationListModel::IsBackgroundApp(*extension,
+                                                            service->profile()),
             create_background);
   extensions->insert(extension);
   ++*count;
@@ -258,8 +270,10 @@ void RemoveExtension(ExtensionService* service,
     }
     scoped_refptr<Extension> extension = cursor->get();
     std::string id = extension->id();
-    if (BackgroundApplicationListModel::IsBackgroundApp(*extension))
+    if (BackgroundApplicationListModel::IsBackgroundApp(*extension,
+                                                        service->profile())) {
       --*expected;
+    }
     extensions->erase(cursor);
     --*count;
     ASSERT_EQ(*count, extensions->size());
@@ -290,7 +304,8 @@ void TogglePermission(ExtensionService* service,
     }
     scoped_refptr<Extension> extension = cursor->get();
     std::string id = extension->id();
-    if (BackgroundApplicationListModel::IsBackgroundApp(*extension)) {
+    if (BackgroundApplicationListModel::IsBackgroundApp(*extension,
+                                                        service->profile())) {
       --*expected;
       ASSERT_EQ(*count, extensions->size());
       RemoveBackgroundPermission(service, extension);