Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/unpacked_installer.cc

Index: chrome/browser/extensions/unpacked_installer.cc
===================================================================
--- chrome/browser/extensions/unpacked_installer.cc	(revision 113231)
+++ chrome/browser/extensions/unpacked_installer.cc	(working copy)
@@ -194,15 +194,12 @@
   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_,