Remove import process workarounds from ExtensionService

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2013 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 <iterator>
 #include <set>
 
@@ skipping 541 matching lines @@
   if (cmd_line->HasSwitch(switches::kInstallFromWebstore) ||
       cmd_line->HasSwitch(switches::kLimitedInstallFromWebstore)) {
     // The sole purpose of this launch is to install a new extension from CWS
     // and immediately terminate: loading already installed extensions is
     // unnecessary and may interfere with the inline install dialog (e.g. if an
     // extension listens to onStartup and opens a window).
     SetReadyAndNotifyListeners();
   } else {
     // TODO(mek): It might be cleaner to do the FinishDelayedInstallInfo stuff
     // here instead of in installedloader.
-    if (g_browser_process->profile_manager() &&
-        g_browser_process->profile_manager()->will_import()) {
-      // Do not load any component extensions, since they may conflict with the
-      // import process.
 
-      extensions::InstalledLoader(this).LoadAllExtensions();
-      SetReadyAndNotifyListeners();
-      RegisterForImportFinished();

[asargent_no_longer_on_chrome, 2013/06/19 18:32:23]

I think we can get rid of this RegisterForImportFinished method, as well as the
NOTIFICATION_IMPORT_FINISHED case in ExtensionService::Observe.

Also, there is similar code towards to this the end of
ExtensionSystemImpl::Shared::Init which we can simplify. 

Hopefully that's the entire length of string that will come out when pulling on
this thread. =)

[elijahtaylor1, 2013/06/19 19:04:01]

Great suggestion, I saw this notification and wasn't sure if it could go away. 
Done

-    } else {
-      // In this case, LoadAllExtensions() calls OnLoadedInstalledExtensions().
-      component_loader_->LoadAll();
-      extensions::InstalledLoader(this).LoadAllExtensions();
-      SetReadyAndNotifyListeners();
+    // LoadAllExtensions() calls OnLoadedInstalledExtensions().
+    component_loader_->LoadAll();
+    extensions::InstalledLoader(this).LoadAllExtensions();
+    SetReadyAndNotifyListeners();
 
-      // 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 to a future point
+    // rather than running immediately at startup.
+    CheckForExternalUpdates();
 
-      base::MessageLoop::current()->PostDelayedTask(
-          FROM_HERE,
-          base::Bind(&ExtensionService::GarbageCollectExtensions, AsWeakPtr()),
-          base::TimeDelta::FromSeconds(kGarbageCollectStartupDelay));
-    }
+    base::MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&ExtensionService::GarbageCollectExtensions, AsWeakPtr()),
+        base::TimeDelta::FromSeconds(kGarbageCollectStartupDelay));
 
     if (extension_prefs_->NeedsStorageGarbageCollection()) {
       GarbageCollectIsolatedStorage();
       extension_prefs_->SetNeedsStorageGarbageCollection(false);
     }
   }
 }
 
 bool ExtensionService::UpdateExtension(const std::string& id,
                                        const base::FilePath& extension_path,
@@ skipping 2320 matching lines @@
 }
 
 void ExtensionService::AddUpdateObserver(extensions::UpdateObserver* observer) {
   update_observers_.AddObserver(observer);
 }
 
 void ExtensionService::RemoveUpdateObserver(
     extensions::UpdateObserver* observer) {
   update_observers_.RemoveObserver(observer);
 }