Renamed ExtensionIdSet to ExtensionIds

chrome/browser/extensions/extension_sorting.cc

 // Copyright (c) 2012 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/extensions/extension_sorting.h"
 
 #include "chrome/browser/extensions/extension_scoped_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 26 matching lines @@
 
 ExtensionSorting::~ExtensionSorting() {
 }
 
 void ExtensionSorting::SetExtensionService(
     ExtensionServiceInterface* extension_service) {
   extension_service_ = extension_service;
 }
 
 void ExtensionSorting::Initialize(
-    const ExtensionPrefs::ExtensionIdSet& extension_ids) {
+    const ExtensionPrefs::ExtensionIds& extension_ids) {
   InitializePageOrdinalMap(extension_ids);
 
   MigrateAppIndex(extension_ids);
 }
 
 void ExtensionSorting::CreateOrdinalsIfNecessary(size_t minimum_size) {
   // Create StringOrdinal values as required to ensure |ntp_ordinal_map_| has at
   // least |minimum_size| entries.
   if (ntp_ordinal_map_.empty() && minimum_size > 0)
     ntp_ordinal_map_[StringOrdinal::CreateInitialOrdinal()];
 
   while (ntp_ordinal_map_.size() < minimum_size) {
     StringOrdinal filler = ntp_ordinal_map_.rbegin()->first.CreateAfter();
     AppLaunchOrdinalMap empty_ordinal_map;
     ntp_ordinal_map_.insert(std::make_pair(filler, empty_ordinal_map));
   }
 }
 
 void ExtensionSorting::MigrateAppIndex(
-    const ExtensionPrefs::ExtensionIdSet& extension_ids) {
+    const ExtensionPrefs::ExtensionIds& extension_ids) {
   if (extension_ids.empty())
     return;
 
   // Convert all the page index values to page ordinals. If there are any
   // app launch values that need to be migrated, inserted them into a sorted
   // set to be dealt with later.
   typedef std::map<StringOrdinal, std::map<int, const std::string*>,
       StringOrdinalLessThan> AppPositionToIdMapping;
   AppPositionToIdMapping app_launches_to_convert;
-  for (ExtensionPrefs::ExtensionIdSet::const_iterator ext_id =
+  for (ExtensionPrefs::ExtensionIds::const_iterator ext_id =
            extension_ids.begin(); ext_id != extension_ids.end(); ++ext_id) {
     int old_page_index = 0;
     StringOrdinal page = GetPageOrdinal(*ext_id);
     if (extension_scoped_prefs_->ReadExtensionPrefInteger(
             *ext_id,
             kPrefPageIndexDeprecated,
             &old_page_index)) {
       // Some extensions have invalid page index, so we don't
       // attempt to convert them.
       if (old_page_index < 0) {
@@ skipping 346 matching lines @@
     if (return_type == ExtensionSorting::MAX_ORDINAL)
       return_value = app_list.rbegin()->first;
     else if (return_type == ExtensionSorting::MIN_ORDINAL)
       return_value = app_list.begin()->first;
   }
 
   return return_value;
 }
 
 void ExtensionSorting::InitializePageOrdinalMap(
-    const ExtensionPrefs::ExtensionIdSet& extension_ids) {
-  for (ExtensionPrefs::ExtensionIdSet::const_iterator ext_it =
+    const ExtensionPrefs::ExtensionIds& extension_ids) {
+  for (ExtensionPrefs::ExtensionIds::const_iterator ext_it =
            extension_ids.begin(); ext_it != extension_ids.end(); ++ext_it) {
     AddOrdinalMapping(*ext_it,
                       GetPageOrdinal(*ext_it),
                       GetAppLaunchOrdinal(*ext_it));
 
     // Ensure that the web store app still isn't found in this list, since
     // it is added after this loop.
     DCHECK(*ext_it != extension_misc::kWebStoreAppId);
   }
 
@@ skipping 49 matching lines @@
     if (ext) {
       // It is possible for old extension to have ordinal values, but they
       // shouldn't so we clear them.
       if (!ext->is_app())
         ClearOrdinals(extension_id);
 
       extension_service_->SyncExtensionChangeIfNeeded(*ext);
     }
   }
 }