| Index: chrome/browser/extensions/extension_system.cc
|
| diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
|
| index 1a6cda5fce809b66eb6f4b05312abdc62b95cb7d..8aaf8783e7aa9f37a00e3b0b85b2227bf4838447 100644
|
| --- a/chrome/browser/extensions/extension_system.cc
|
| +++ b/chrome/browser/extensions/extension_system.cc
|
| @@ -202,17 +202,14 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
|
| // 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 this profile is being created as part of the import process, never
|
| - // initialize the event routers. 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 (!command_line->HasSwitch(switches::kImport) &&
|
| - !command_line->HasSwitch(switches::kImportFromFile)) {
|
| - if (g_browser_process->profile_manager()->will_import()) {
|
| - extension_service_->InitEventRoutersAfterImport();
|
| - } else {
|
| - extension_service_->InitEventRouters();
|
| - }
|
| + // 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.
|
| + CHECK(!ProfileManager::IsImportProcess(*command_line));
|
| + if (g_browser_process->profile_manager()->will_import()) {
|
| + extension_service_->InitEventRoutersAfterImport();
|
| + } else {
|
| + extension_service_->InitEventRouters();
|
| }
|
|
|
| extension_warning_service_.reset(new ExtensionWarningService(profile_));
|
|
|