Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 4363 matching lines @@
     DictionaryValue* args,
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   ExtensionService* service = profile()->GetExtensionService();
   if (!service) {
     reply.SendError("No extensions service.");
     return;
   }
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   ListValue* extensions_values = new ListValue;
-  const ExtensionList* extensions = service->extensions();
-  const ExtensionList* disabled_extensions = service->disabled_extensions();
+  const ExtensionSet* extensions = service->extensions();
+  const ExtensionSet* disabled_extensions = service->disabled_extensions();
   ExtensionList all;
   all.insert(all.end(),
              extensions->begin(),
              extensions->end());
   all.insert(all.end(),
              disabled_extensions->begin(),
              disabled_extensions->end());
   for (ExtensionList::const_iterator it = all.begin();
        it != all.end(); ++it) {
     const Extension* extension = *it;
@@ skipping 2250 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }