Remove import process workarounds from ExtensionService

chrome/browser/extensions/extension_system.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 "chrome/browser/extensions/extension_system.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 186 matching lines @@
   content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_));
 
   // Initialize extension event routers. Note that on Chrome OS, this will
   // not succeed if the user has not logged in yet, in which case the
   // event routers are initialized in LoginUtilsImpl::CompleteLogin instead.
   // The InitEventRouters call used to be in BrowserMain, because when bookmark
   // import happened on first run, the bookmark bar was not being correctly
   // initialized (see issue 40144). Now that bookmarks aren't imported and
   // the event routers need to be initialized for every profile individually,
   // initialize them with the extension service.
-  // If import is going to run in a separate process (the profile itself is on
-  // the main process), wait for import to finish before initializing the
-  // routers.
-  if (g_browser_process->profile_manager()->will_import()) {
-    extension_service_->InitEventRoutersAfterImport();
-  } else {
-    extension_service_->InitEventRouters();
-  }
+  extension_service_->InitEventRouters();
 
   extension_warning_service_.reset(new ExtensionWarningService(profile_));
   extension_warning_badge_service_.reset(
       new ExtensionWarningBadgeService(profile_));
   extension_warning_service_->AddObserver(
       extension_warning_badge_service_.get());
 }
 
 void ExtensionSystemImpl::Shared::Shutdown() {
   if (extension_warning_service_) {
@@ skipping 150 matching lines @@
 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
     const std::string& extension_id,
     const extension_misc::UnloadedExtensionReason reason) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(),
                  extension_id, reason));
 }
 
 }  // namespace extensions