Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc	(revision 113231)
+++ chrome/browser/automation/testing_automation_provider.cc	(working copy)
@@ -4381,8 +4381,8 @@
   }
   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(),
Property changes on: chrome/browser/automation/testing_automation_provider.cc
___________________________________________________________________
Added: svn:mergeinfo