Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/sync/test/integration/sync_extension_helper.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/sync/test/integration/sync_extension_helper.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 60 matching lines @@
     Profile* profile, const std::string& name) {
   ExtensionService::UninstallExtensionHelper(profile->GetExtensionService(),
                                              NameToId(name));
 }
 
 std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames(
     Profile* profile) const {
   std::vector<std::string> names;
   ExtensionService* extension_service = profile->GetExtensionService();
 
-  const ExtensionList* extensions = extension_service->extensions();
-  for (ExtensionList::const_iterator it = extensions->begin();
+  const ExtensionSet* extensions = extension_service->extensions();
+  for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
-  const ExtensionList* disabled_extensions =
+  const ExtensionSet* disabled_extensions =
       extension_service->disabled_extensions();
-  for (ExtensionList::const_iterator it = disabled_extensions->begin();
+  for (ExtensionSet::const_iterator it = disabled_extensions->begin();
        it != disabled_extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
-  const ExtensionList* terminated_extensions =
+  const ExtensionSet* terminated_extensions =
       extension_service->terminated_extensions();
-  for (ExtensionList::const_iterator it = terminated_extensions->begin();
+  for (ExtensionSet::const_iterator it = terminated_extensions->begin();
        it != terminated_extensions->end(); ++it) {
     names.push_back((*it)->name());
   }
 
   return names;
 }
 
 void SyncExtensionHelper::EnableExtension(Profile* profile,
                                           const std::string& name) {
   profile->GetExtensionService()->EnableExtension(NameToId(name));
@@ skipping 66 matching lines @@
 }
 
 SyncExtensionHelper::ExtensionStateMap
     SyncExtensionHelper::GetExtensionStates(Profile* profile) {
   const std::string& profile_debug_name = profile->GetDebugName();
 
   ExtensionStateMap extension_state_map;
 
   ExtensionService* extension_service = profile->GetExtensionService();
 
-  const ExtensionList* extensions = extension_service->extensions();
-  for (ExtensionList::const_iterator it = extensions->begin();
+  const ExtensionSet* extensions = extension_service->extensions();
+  for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     const std::string& id = (*it)->id();
     extension_state_map[id].enabled_state = ExtensionState::ENABLED;
     extension_state_map[id].incognito_enabled =
         extension_service->IsIncognitoEnabled(id);
     DVLOG(2) << "Extension " << (*it)->id() << " in profile "
              << profile_debug_name << " is enabled";
   }
 
-  const ExtensionList* disabled_extensions =
+  const ExtensionSet* disabled_extensions =
       extension_service->disabled_extensions();
-  for (ExtensionList::const_iterator it = disabled_extensions->begin();
+  for (ExtensionSet::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;
     extension_state_map[id].incognito_enabled =
         extension_service->IsIncognitoEnabled(id);
     DVLOG(2) << "Extension " << (*it)->id() << " in profile "
              << profile_debug_name << " is disabled";
   }
 
   const PendingExtensionManager* pending_extension_manager =
@@ skipping 145 matching lines @@
   if (extension->id() != expected_id) {
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   DVLOG(2) << "created extension with name = "
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   return extension;
 }