Delay some extension startup until after first run import.

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 46 matching lines @@
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
 #include "chrome/browser/extensions/external_extension_provider_interface.h"
 #include "chrome/browser/extensions/installed_loader.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/history/history_extension_api.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ skipping 409 matching lines @@
     // provide the IO thread message loop needed for those sockets to do their
     // job (including destroying themselves at shutdown).
     DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::IO));
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         new DeleteTask<extensions::SocketController>(socket_controller_));
   }
 }
 
 void ExtensionService::InitEventRoutersAfterImport() {
-  registrar_.Add(this, chrome::NOTIFICATION_IMPORT_FINISHED,
-                 content::Source<Profile>(profile_));
+  RegisterForImportFinished();
+}
+
+void ExtensionService::RegisterForImportFinished() {
+  if (!registrar_.IsRegistered(this, chrome::NOTIFICATION_IMPORT_FINISHED,
+                               content::Source<Profile>(profile_))) {
+    registrar_.Add(this, chrome::NOTIFICATION_IMPORT_FINISHED,
+                   content::Source<Profile>(profile_));
+  }
+}
+
+void ExtensionService::InitAfterImport() {
+  CheckForExternalUpdates();
+
+  GarbageCollectExtensions();
+
+  // Idempotent, so although there is a possible race if the import
+  // process finished sometime in the middle of ProfileImpl::InitExtensions,
+  // it cannot happen twice.
+  InitEventRouters();
 }
 
 void ExtensionService::InitEventRouters() {
   if (event_routers_initialized_)
     return;
 
   downloads_event_router_.reset(new ExtensionDownloadsEventRouter(profile_));
   history_event_router_.reset(new HistoryExtensionEventRouter());
   history_event_router_->ObserveProfile(profile_);
   browser_event_router_.reset(new ExtensionBrowserEventRouter(profile_));
@@ skipping 48 matching lines @@
   component_loader_->LoadAll();
   extensions::InstalledLoader(this).LoadAllExtensions();
 
   // If we are running in the import process, don't bother initializing the
   // extension service since this can interfere with the main browser process
   // that is already running an extension service for this profile.
   // TODO(aa): can we start up even less of ExtensionService?
   // http://crbug.com/107636
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kImport) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kImportFromFile)) {
-    // TODO(erikkay) this should probably be deferred to a future point
-    // rather than running immediately at startup.
-    CheckForExternalUpdates();
+    if (g_browser_process->profile_manager() &&
+        g_browser_process->profile_manager()->will_import()) {
+      RegisterForImportFinished();
+    } else {
+      // TODO(erikkay) this should probably be deferred to a future point
+      // rather than running immediately at startup.
+      CheckForExternalUpdates();
 
-    // TODO(erikkay) this should probably be deferred as well.
-    GarbageCollectExtensions();
+      // TODO(erikkay) this should probably be deferred as well.
+      GarbageCollectExtensions();
+    }
   }
 }
 
 bool ExtensionService::UpdateExtension(
     const std::string& id,
     const FilePath& extension_path,
     const GURL& download_url,
     CrxInstaller** out_crx_installer) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 1857 matching lines @@
       std::string* pref_name = content::Details<std::string>(details).ptr();
       if (*pref_name == prefs::kExtensionInstallAllowList ||
           *pref_name == prefs::kExtensionInstallDenyList) {
         CheckAdminBlacklist();
       } else {
         NOTREACHED() << "Unexpected preference name.";
       }
       break;
     }
     case chrome::NOTIFICATION_IMPORT_FINISHED: {
-      registrar_.Remove(this, chrome::NOTIFICATION_IMPORT_FINISHED,
-                        content::Source<Profile>(profile_));
-      InitEventRouters();
+      InitAfterImport();
       break;
     }
 
     default:
       NOTREACHED() << "Unexpected notification type.";
   }
 }
 
 bool ExtensionService::HasApps() const {
   return !GetAppIds().empty();
@@ skipping 180 matching lines @@
   //
   // To coexist with certain unit tests that don't have an IO thread message
   // loop available at ExtensionService shutdown, we lazy-initialize this
   // object so that those cases neither create nor destroy a SocketController.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!socket_controller_) {
     socket_controller_ = new extensions::SocketController();
   }
   return socket_controller_;
 }