| Index: chrome/browser/profiles/profile_manager.cc
|
| diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
|
| index ca55479b0a93cb25136fb86aa62cdcdbeb2011ad..ddf53e7fc05c760a7d142a78efacf0e7b91e2045 100644
|
| --- a/chrome/browser/profiles/profile_manager.cc
|
| +++ b/chrome/browser/profiles/profile_manager.cc
|
| @@ -713,12 +713,6 @@ void ProfileManager::Observe(
|
| }
|
| }
|
|
|
| -// static
|
| -bool ProfileManager::IsImportProcess(const CommandLine& command_line) {
|
| - return (command_line.HasSwitch(switches::kImport) ||
|
| - command_line.HasSwitch(switches::kImportFromFile));
|
| -}
|
| -
|
| void ProfileManager::SetWillImport() {
|
| will_import_ = true;
|
| }
|
| @@ -794,16 +788,13 @@ void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
|
| void ProfileManager::DoFinalInitForServices(Profile* profile,
|
| bool go_off_the_record) {
|
| #if defined(ENABLE_EXTENSIONS)
|
| - const CommandLine& command_line = *CommandLine::ForCurrentProcess();
|
| - if (!IsImportProcess(command_line)) {
|
| - extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(
|
| - !go_off_the_record);
|
| - // During tests, when |profile| is an instance of TestingProfile,
|
| - // ExtensionSystem might not create an ExtensionService.
|
| - if (extensions::ExtensionSystem::Get(profile)->extension_service()) {
|
| - profile->GetHostContentSettingsMap()->RegisterExtensionService(
|
| - extensions::ExtensionSystem::Get(profile)->extension_service());
|
| - }
|
| + extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(
|
| + !go_off_the_record);
|
| + // During tests, when |profile| is an instance of TestingProfile,
|
| + // ExtensionSystem might not create an ExtensionService.
|
| + if (extensions::ExtensionSystem::Get(profile)->extension_service()) {
|
| + profile->GetHostContentSettingsMap()->RegisterExtensionService(
|
| + extensions::ExtensionSystem::Get(profile)->extension_service());
|
| }
|
| #endif
|
| #if defined(ENABLE_MANAGED_USERS)
|
|
|