Do not load extension system in the Profile import process.

chrome/browser/extensions/component_loader_unittest.cc

Index: chrome/browser/extensions/component_loader_unittest.cc
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 2bce8576b109265c0b0169ef438c0bc2a7dcb9b3..131e7c973132b6ec6fbc79287a4f32e354882ced 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -196,7 +196,7 @@ TEST_F(ComponentLoaderTest, Remove) {
   // Try adding and removing before LoadAll() is called.
   component_loader_.Add(manifest_contents_, extension_path_);
   component_loader_.Remove(extension_path_);
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
   EXPECT_EQ(0u, extension_service_.extensions()->size());
 
   // Load an extension, and check that it's unloaded when Remove() is called.
@@ -208,7 +208,7 @@ TEST_F(ComponentLoaderTest, Remove) {
   EXPECT_EQ(0u, extension_service_.extensions()->size());
 
   // And after calling LoadAll(), it shouldn't get loaded.
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
   EXPECT_EQ(0u, extension_service_.extensions()->size());
 }
 
@@ -216,22 +216,45 @@ TEST_F(ComponentLoaderTest, LoadAll) {
   extension_service_.set_ready(false);
 
   // No extensions should be loaded if none were added.
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
   EXPECT_EQ(0u, extension_service_.extensions()->size());
 
   // Use LoadAll() to load the default extensions.
   component_loader_.AddDefaultComponentExtensions(false);
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
   unsigned int default_count = extension_service_.extensions()->size();
 
   // Clear the list of loaded extensions, and reload with one more.
   extension_service_.clear_extensions();
   component_loader_.Add(manifest_contents_, extension_path_);
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
 
   EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
 }
 
+TEST_F(ComponentLoaderTest, LoadAllDeferred) {
+  extension_service_.set_ready(false);
+
+  // Use LoadAll(true) to get a baseline of extensions with background pages.
+  component_loader_.AddDefaultComponentExtensions(false);
+  component_loader_.LoadAll(true);
+  unsigned int default_count_no_bg = extension_service_.extensions()->size();
+  component_loader_.LoadAllDeferred();
+  unsigned int default_count_bg = extension_service_.extensions()->size();
+
+  // Clear and reload with one more, which is known to have a background page.
+  extension_service_.clear_extensions();
+  component_loader_.Add(manifest_contents_, extension_path_);
+  component_loader_.LoadAll(true);
+
+  // Count should not change, since the load will be deferred.
+  EXPECT_EQ(default_count_no_bg, extension_service_.extensions()->size());
+
+  // After loading deferred there should be one more than previously.
+  component_loader_.LoadAllDeferred();
+  EXPECT_EQ(default_count_bg + 1, extension_service_.extensions()->size());
+}
+
 TEST_F(ComponentLoaderTest, RemoveAll) {
   extension_service_.set_ready(true);
   EXPECT_EQ(0u, extension_service_.extensions()->size());
@@ -251,7 +274,7 @@ TEST_F(ComponentLoaderTest, RemoveAll) {
 
 TEST_F(ComponentLoaderTest, EnterpriseWebStore) {
   component_loader_.AddDefaultComponentExtensions(false);
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
   unsigned int default_count = extension_service_.extensions()->size();
 
   // Set the pref, and it should get loaded automatically.
@@ -265,7 +288,7 @@ TEST_F(ComponentLoaderTest, EnterpriseWebStore) {
   extension_service_.clear_extensions();
   component_loader_.ClearAllRegistered();
   component_loader_.AddDefaultComponentExtensions(false);
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
   EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
 
   // Number of loaded extensions should be the same after changing the pref.
@@ -293,7 +316,7 @@ TEST_F(ComponentLoaderTest, AddOrReplace) {
             component_loader_.registered_extensions_count());
 
   extension_service_.set_ready(true);
-  component_loader_.LoadAll();
+  component_loader_.LoadAll(false);
 
   EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
   EXPECT_EQ(0u, extension_service_.unloaded_count());