Sanity tweaks to the extension blacklist: check all extensions at once on

chrome/browser/extensions/extension_service.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_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 
@@ skipping 2017 matching lines @@
 
 void ExtensionService::SyncExtensionChangeIfNeeded(const Extension& extension) {
   if (app_sync_bundle_.HandlesApp(extension)) {
     app_sync_bundle_.SyncChangeIfNeeded(extension);
   } else if (extension_sync_bundle_.HandlesExtension(extension)) {
     extension_sync_bundle_.SyncChangeIfNeeded(extension);
   }
 }
 
 void ExtensionService::OnLoadedInstalledExtensions() {
+  DCHECK(!ready_);
+
   if (updater_.get())
     updater_->Start();
 
+  OnBlacklistUpdated();
+
   ready_ = true;
+
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSIONS_READY,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }
 
 void ExtensionService::AddExtension(const Extension* extension) {
   // TODO(jstritar): We may be able to get rid of this branch by overriding the
   // default extension state to DISABLED when the --disable-extensions flag
   // is set (http://crbug.com/29067).
@@ skipping 17 matching lines @@
     EnableExtension(extension->id());
 
   // Check if the extension's privileges have changed and disable the
   // extension if necessary.
   InitializePermissions(extension);
 
   // If this extension is a sideloaded extension and we've not performed a
   // wipeout before, we might disable this extension here.
   MaybeWipeout(extension);
 
-  // Communicated to the Blacklist.
-  std::set<std::string> already_in_blacklist;
-
   if (extension_prefs_->IsExtensionBlacklisted(extension->id())) {
     // Don't check the Blacklist yet because it's asynchronous (we do it at
     // the end). This pre-emptive check is because we will always store the
     // blacklisted state of *installed* extensions in prefs, and it's important
     // not to re-enable blacklisted extensions.
     blacklisted_extensions_.Insert(extension);
-    already_in_blacklist.insert(extension->id());
   } else if (extension_prefs_->IsExtensionDisabled(extension->id())) {
     disabled_extensions_.Insert(extension);
     SyncExtensionChangeIfNeeded(*extension);
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
         content::Source<Profile>(profile_),
         content::Details<const Extension>(extension));
 
     // Show the extension disabled error if a permissions increase was the
     // only reason it was disabled.
     if (extension_prefs_->GetDisableReasons(extension->id()) ==
         Extension::DISABLE_PERMISSIONS_INCREASE) {
       extensions::AddExtensionDisabledError(this, extension);
     }
   } else {
     // All apps that are displayed in the launcher are ordered by their ordinals
     // so we must ensure they have valid ordinals.
     if (extension->RequiresSortOrdinal()) {
       extension_prefs_->extension_sorting()->EnsureValidOrdinals(
           extension->id(), syncer::StringOrdinal());
     }
 
     extensions_.Insert(extension);
     SyncExtensionChangeIfNeeded(*extension);
     NotifyExtensionLoaded(extension);
     DoPostLoadTasks(extension);
   }
-
-  // Lastly, begin the process for checking the blacklist status of extensions.
-  // This may need to go to other threads so is asynchronous.
-  std::set<std::string> id_set;
-  id_set.insert(extension->id());
-  blacklist_->GetBlacklistedIDs(
-      id_set,
-      base::Bind(&ExtensionService::ManageBlacklist,
-                 AsWeakPtr(),
-                 already_in_blacklist));
 }
 
 void ExtensionService::AddComponentExtension(const Extension* extension) {
   const std::string old_version_string(
       extension_prefs_->GetVersionString(extension->id()));
   const Version old_version(old_version_string);
 
   if (!old_version.IsValid() || !old_version.Equals(*extension->version())) {
     VLOG(1) << "Component extension " << extension->name() << " ("
         << extension->id() << ") installing/upgrading from '"
@@ skipping 338 matching lines @@
   // Unpacked extensions default to allowing file access, but if that has been
   // overridden, don't reset the value.
   if (Manifest::ShouldAlwaysAllowFileAccess(extension->location()) &&
       !extension_prefs_->HasAllowFileAccessSetting(extension->id())) {
     extension_prefs_->SetAllowFileAccess(extension->id(), true);
   }
 
   AddExtension(extension);
 
 #if defined(ENABLE_THEMES)
-  // We do this here since AddExtension() is always called on browser
-  // startup, and we only really care about the last theme installed.
+  // We do this here since AddExtension() is always called on browser startup,
+  // and we only really care about the last theme installed.
   // If that ever changes and we have to move this code somewhere
   // else, it should be somewhere that's not in the startup path.
   if (extension->is_theme() && extensions_.GetByID(extension->id())) {
     DCHECK_EQ(extensions_.GetByID(extension->id()), extension);
     // Now that the theme extension is visible from outside the
     // ExtensionService, notify the ThemeService about the
     // newly-installed theme.
     ThemeServiceFactory::GetForProfile(profile_)->SetTheme(extension);
   }
 #endif
@@ skipping 619 matching lines @@
     scoped_refptr<const Extension> extension = GetInstalledExtension(*it);
     DCHECK(extension);
     if (!extension)
       continue;
     blacklisted_extensions_.Insert(extension);
     UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
   }
 
   IdentifyAlertableExtensions();
 }