Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/themes/theme_service.cc

Index: chrome/browser/themes/theme_service.cc
===================================================================
--- chrome/browser/themes/theme_service.cc	(revision 113231)
+++ chrome/browser/themes/theme_service.cc	(working copy)
@@ -338,8 +338,8 @@
     return;
   std::string current_theme = GetThemeID();
   std::vector<std::string> remove_list;
-  const ExtensionList* extensions = service->extensions();
-  for (ExtensionList::const_iterator it = extensions->begin();
+  const ExtensionSet* extensions = service->extensions();
+  for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     if ((*it)->is_theme() && (*it)->id() != current_theme) {
       remove_list.push_back((*it)->id());
Property changes on: chrome/browser/themes/theme_service.cc
___________________________________________________________________
Deleted: svn:mergeinfo