Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/sync/test/integration/sync_extension_helper.cc

Index: chrome/browser/sync/test/integration/sync_extension_helper.cc
===================================================================
--- chrome/browser/sync/test/integration/sync_extension_helper.cc	(revision 113069)
+++ chrome/browser/sync/test/integration/sync_extension_helper.cc	(working copy)
@@ -78,22 +78,22 @@
   std::vector<std::string> names;
   ExtensionService* extension_service = profile->GetExtensionService();
 
-  const ExtensionSet* extensions = extension_service->extensions();
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  const ExtensionList* extensions = extension_service->extensions();
+  for (ExtensionList::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
-  const ExtensionSet* disabled_extensions =
+  const ExtensionList* disabled_extensions =
       extension_service->disabled_extensions();
-  for (ExtensionSet::const_iterator it = disabled_extensions->begin();
+  for (ExtensionList::const_iterator it = disabled_extensions->begin();
        it != disabled_extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
-  const ExtensionSet* terminated_extensions =
+  const ExtensionList* terminated_extensions =
       extension_service->terminated_extensions();
-  for (ExtensionSet::const_iterator it = terminated_extensions->begin();
+  for (ExtensionList::const_iterator it = terminated_extensions->begin();
        it != terminated_extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
@@ -180,8 +180,8 @@
 
   ExtensionService* extension_service = profile->GetExtensionService();
 
-  const ExtensionSet* extensions = extension_service->extensions();
-  for (ExtensionSet::const_iterator it = extensions->begin();
+  const ExtensionList* extensions = extension_service->extensions();
+  for (ExtensionList::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     const std::string& id = (*it)->id();
     extension_state_map[id].enabled_state = ExtensionState::ENABLED;
@@ -191,9 +191,9 @@
              << profile_debug_name << " is enabled";
   }
 
-  const ExtensionSet* disabled_extensions =
+  const ExtensionList* disabled_extensions =
       extension_service->disabled_extensions();
-  for (ExtensionSet::const_iterator it = disabled_extensions->begin();
+  for (ExtensionList::const_iterator it = disabled_extensions->begin();
        it != disabled_extensions->end(); ++it) {
     const std::string& id = (*it)->id();
     extension_state_map[id].enabled_state = ExtensionState::DISABLED;
Property changes on: chrome/browser/sync/test/integration/sync_extension_helper.cc
___________________________________________________________________
Added: svn:mergeinfo