Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/unpacked_installer.cc

 // Copyright (c) 2011 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/unpacked_installer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
@@ skipping 176 matching lines @@
   if (!service_weak_.get())
     return;
   service_weak_->ReportExtensionLoadError(extension_path_, error, true);
 }
 
 void UnpackedInstaller::OnLoaded(
     const scoped_refptr<const Extension>& extension) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!service_weak_.get())
     return;
-  const ExtensionList* disabled_extensions =
+  const ExtensionSet* disabled_extensions =
       service_weak_->disabled_extensions();
   if (service_weak_->show_extensions_prompts() &&
       prompt_for_plugins_ &&
       !extension->plugins().empty() &&
-      std::find(disabled_extensions->begin(),
-                disabled_extensions->end(),
-                extension) !=
-      disabled_extensions->end()) {
+      disabled_extensions->Contains(extension->id())) {
     SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt(
         service_weak_->profile(),
         service_weak_,
         extension);
     prompt->ShowPrompt();
     return;  // continues in SimpleExtensionLoadPrompt::InstallUI*
   }
   service_weak_->OnExtensionInstalled(extension,
                                       false,  // Not from web store.
                                       -1);
 }
 
 }  // namespace extensions