Renamed ExtensionIdSet to ExtensionIds

BUG=


Review URL: https://chromiumcodereview.appspot.com/10824344

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152173 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_prefs.cc

@@ -784,7 +784,7 @@ void ExtensionPrefs::ClearDisableReasons(const std::string& extension_id) {
 
 void ExtensionPrefs::UpdateBlacklist(
     const std::set<std::string>& blacklist_set) {
-  ExtensionIdSet remove_pref_ids;
+  ExtensionIds remove_pref_ids;
   std::set<std::string> used_id_set;
   const DictionaryValue* extensions = prefs_->GetDictionary(kExtensionsPref);
 
@@ -913,9 +913,9 @@ void ExtensionPrefs::SetActiveBit(const std::string& extension_id,
                       Value::CreateBooleanValue(active));
 }
 
-void ExtensionPrefs::MigratePermissions(const ExtensionIdSet& extension_ids) {
+void ExtensionPrefs::MigratePermissions(const ExtensionIds& extension_ids) {
   PermissionsInfo* info = PermissionsInfo::GetInstance();
-  for (ExtensionIdSet::const_iterator ext_id =
+  for (ExtensionIds::const_iterator ext_id =
        extension_ids.begin(); ext_id != extension_ids.end(); ++ext_id) {
 
     // An extension's granted permissions need to be migrated if the
@@ -968,8 +968,8 @@ void ExtensionPrefs::MigratePermissions(const ExtensionIdSet& extension_ids) {
 }
 
 void ExtensionPrefs::MigrateDisableReasons(
-    const ExtensionIdSet& extension_ids) {
-  for (ExtensionIdSet::const_iterator ext_id =
+    const ExtensionIds& extension_ids) {
+  for (ExtensionIds::const_iterator ext_id =
        extension_ids.begin(); ext_id != extension_ids.end(); ++ext_id) {
     int value = -1;
     if (ReadExtensionPrefInteger(*ext_id, kDeprecatedPrefDisableReason,
@@ -1410,19 +1410,19 @@ bool ExtensionPrefs::IsExtensionDisabled(
   return DoesExtensionHaveState(id, Extension::DISABLED);
 }
 
-ExtensionPrefs::ExtensionIdSet ExtensionPrefs::GetToolbarOrder() {
+ExtensionPrefs::ExtensionIds ExtensionPrefs::GetToolbarOrder() {
   return GetExtensionPrefAsVector(GetToolbarOrderKeyName());
 }
 
-void ExtensionPrefs::SetToolbarOrder(const ExtensionIdSet& extension_ids) {
+void ExtensionPrefs::SetToolbarOrder(const ExtensionIds& extension_ids) {
   SetExtensionPrefFromVector(GetToolbarOrderKeyName(), extension_ids);
 }
 
-ExtensionPrefs::ExtensionIdSet ExtensionPrefs::GetActionBoxOrder() {
+ExtensionPrefs::ExtensionIds ExtensionPrefs::GetActionBoxOrder() {
   return GetExtensionPrefAsVector(kExtensionActionBox);
 }
 
-void ExtensionPrefs::SetActionBoxOrder(const ExtensionIdSet& extension_ids) {
+void ExtensionPrefs::SetActionBoxOrder(const ExtensionIds& extension_ids) {
   SetExtensionPrefFromVector(kExtensionActionBox, extension_ids);
 }
 
@@ -1890,7 +1890,7 @@ base::Time ExtensionPrefs::GetInstallTime(
   return base::Time::FromInternalValue(install_time_i64);
 }
 
-void ExtensionPrefs::GetExtensions(ExtensionIdSet* out) {
+void ExtensionPrefs::GetExtensions(ExtensionIds* out) {
   CHECK(out);
 
   scoped_ptr<ExtensionsInfo> extensions_info(GetInstalledExtensionsInfo());
@@ -1902,9 +1902,9 @@ void ExtensionPrefs::GetExtensions(ExtensionIdSet* out) {
 }
 
 // static
-ExtensionPrefs::ExtensionIdSet ExtensionPrefs::GetExtensionsFrom(
+ExtensionPrefs::ExtensionIds ExtensionPrefs::GetExtensionsFrom(
     const base::DictionaryValue* extension_prefs) {
-  ExtensionIdSet result;
+  ExtensionIds result;
   for (base::DictionaryValue::key_iterator it = extension_prefs->begin_keys();
        it != extension_prefs->end_keys(); ++it) {
     const DictionaryValue* ext;
@@ -1918,10 +1918,10 @@ ExtensionPrefs::ExtensionIdSet ExtensionPrefs::GetExtensionsFrom(
   return result;
 }
 
-void ExtensionPrefs::FixMissingPrefs(const ExtensionIdSet& extension_ids) {
+void ExtensionPrefs::FixMissingPrefs(const ExtensionIds& extension_ids) {
   // Fix old entries that did not get an installation time entry when they
   // were installed or don't have a preferences field.
-  for (ExtensionIdSet::const_iterator ext_id = extension_ids.begin();
+  for (ExtensionIds::const_iterator ext_id = extension_ids.begin();
        ext_id != extension_ids.end(); ++ext_id) {
     if (GetInstallTime(*ext_id) == base::Time()) {
       LOG(INFO) << "Could not parse installation time of extension "
@@ -1962,11 +1962,11 @@ void ExtensionPrefs::InitPrefStore(bool extensions_disabled) {
 
   // When this is called, the PrefService is initialized and provides access
   // to the user preferences stored in a JSON file.
-  ExtensionIdSet extension_ids;
+  ExtensionIds extension_ids;
   GetExtensions(&extension_ids);
   // Create empty preferences dictionary for each extension (these dictionaries
   // are pruned when persisting the preferences to disk).
-  for (ExtensionIdSet::iterator ext_id = extension_ids.begin();
+  for (ExtensionIds::iterator ext_id = extension_ids.begin();
        ext_id != extension_ids.end(); ++ext_id) {
     ScopedExtensionPrefUpdate update(prefs_, *ext_id);
     // This creates an empty dictionary if none is stored.
@@ -1981,7 +1981,7 @@ void ExtensionPrefs::InitPrefStore(bool extensions_disabled) {
   // Store extension controlled preference values in the
   // |extension_pref_value_map_|, which then informs the subscribers
   // (ExtensionPrefStores) about the winning values.
-  for (ExtensionIdSet::iterator ext_id = extension_ids.begin();
+  for (ExtensionIds::iterator ext_id = extension_ids.begin();
        ext_id != extension_ids.end(); ++ext_id) {
     extension_pref_value_map_->RegisterExtension(
         *ext_id,
@@ -2103,9 +2103,9 @@ bool ExtensionPrefs::HasIncognitoPrefValue(const std::string& pref_key) {
 }
 
 void ExtensionPrefs::ClearIncognitoSessionOnlyContentSettings() {
-  ExtensionIdSet extension_ids;
+  ExtensionIds extension_ids;
   GetExtensions(&extension_ids);
-  for (ExtensionIdSet::iterator ext_id = extension_ids.begin();
+  for (ExtensionIds::iterator ext_id = extension_ids.begin();
        ext_id != extension_ids.end(); ++ext_id) {
     content_settings_store_->ClearContentSettingsForExtension(
         *ext_id,
@@ -2167,9 +2167,9 @@ void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
                           PrefService::UNSYNCABLE_PREF);
 }
 
-ExtensionPrefs::ExtensionIdSet ExtensionPrefs::GetExtensionPrefAsVector(
+ExtensionPrefs::ExtensionIds ExtensionPrefs::GetExtensionPrefAsVector(
     const char* pref) {
-  ExtensionIdSet extension_ids;
+  ExtensionIds extension_ids;
   const ListValue* list_of_values = prefs_->GetList(pref);
   if (!list_of_values)
     return extension_ids;
@@ -2183,11 +2183,11 @@ ExtensionPrefs::ExtensionIdSet ExtensionPrefs::GetExtensionPrefAsVector(
 }
 
 void ExtensionPrefs::SetExtensionPrefFromVector(const char* pref,
-                                                const ExtensionIdSet& strings) {
+                                                const ExtensionIds& strings) {
   ListPrefUpdate update(prefs_, pref);
   ListValue* list_of_values = update.Get();
   list_of_values->Clear();
-  for (ExtensionIdSet::const_iterator iter = strings.begin();
+  for (ExtensionIds::const_iterator iter = strings.begin();
        iter != strings.end(); ++iter)
     list_of_values->Append(new StringValue(*iter));
 }

chrome/browser/extensions/extension_prefs.h

@@ -60,8 +60,7 @@ class ExtensionPrefs : public ContentSettingsStore::Observer,
   typedef std::set<std::string> PrefKeySet;
 
   // Vector containing identifiers for extensions.
-  // TODO(yefim): rename to ExtensionIds.
-  typedef std::vector<std::string> ExtensionIdSet;
+  typedef std::vector<std::string> ExtensionIds;
 
   // This enum is used for the launch type the user wants to use for an
   // application.
@@ -105,12 +104,12 @@ class ExtensionPrefs : public ContentSettingsStore::Observer,
   bool IsExtensionDisabled(const std::string& id) const;
 
   // Get/Set the order that the browser actions appear in the toolbar.
-  ExtensionIdSet GetToolbarOrder();
-  void SetToolbarOrder(const ExtensionIdSet& extension_ids);
+  ExtensionIds GetToolbarOrder();
+  void SetToolbarOrder(const ExtensionIds& extension_ids);
 
   // Get/Set the order that the browser actions appear in the action box.
-  ExtensionIdSet GetActionBoxOrder();
-  void SetActionBoxOrder(const ExtensionIdSet& extension_ids);
+  ExtensionIds GetActionBoxOrder();
+  void SetActionBoxOrder(const ExtensionIds& extension_ids);
 
   // Called when an extension is installed, so that prefs get created.
   // If |page_ordinal| is an invalid ordinal, then a page will be found
@@ -129,12 +128,12 @@ class ExtensionPrefs : public ContentSettingsStore::Observer,
   void SetExtensionState(const std::string& extension_id, Extension::State);
 
   // Returns all installed extensions
-  void GetExtensions(ExtensionIdSet* out);
+  void GetExtensions(ExtensionIds* out);
 
   // Returns all installed extensions from |extension_prefs|. This is exposed
   // for ProtectedPrefsWatcher because it needs access to the extension ID list
   // before the ExtensionService is initialized.
-  static ExtensionIdSet GetExtensionsFrom(
+  static ExtensionIds GetExtensionsFrom(
       const base::DictionaryValue* extension_prefs);
 
   // Getter and setter for browser action visibility.
@@ -546,17 +545,17 @@ class ExtensionPrefs : public ContentSettingsStore::Observer,
 
   // Fix missing preference entries in the extensions that are were introduced
   // in a later Chrome version.
-  void FixMissingPrefs(const ExtensionIdSet& extension_ids);
+  void FixMissingPrefs(const ExtensionIds& extension_ids);
 
   // Installs the persistent extension preferences into |prefs_|'s extension
   // pref store. Does nothing if |extensions_disabled| is true.
   void InitPrefStore(bool extensions_disabled);
 
   // Migrates the permissions data in the pref store.
-  void MigratePermissions(const ExtensionIdSet& extension_ids);
+  void MigratePermissions(const ExtensionIds& extension_ids);
 
   // Migrates the disable reasons from a single enum to a bit mask.
-  void MigrateDisableReasons(const ExtensionIdSet& extension_ids);
+  void MigrateDisableReasons(const ExtensionIds& extension_ids);
 
   // Checks whether there is a state pref for the extension and if so, whether
   // it matches |check_state|.
@@ -564,9 +563,9 @@ class ExtensionPrefs : public ContentSettingsStore::Observer,
                               Extension::State check_state) const;
 
   // Helper function to Get/Set array of strings from/to prefs.
-  ExtensionIdSet GetExtensionPrefAsVector(const char* pref);
+  ExtensionIds GetExtensionPrefAsVector(const char* pref);
   void SetExtensionPrefFromVector(const char* pref,
-                                  const ExtensionIdSet& extension_ids);
+                                  const ExtensionIds& extension_ids);
 
   // The pref service specific to this set of extension prefs. Owned by profile.
   PrefService* prefs_;

chrome/browser/extensions/extension_sorting.cc

@@ -44,7 +44,7 @@ void ExtensionSorting::SetExtensionService(
 }
 
 void ExtensionSorting::Initialize(
-    const ExtensionPrefs::ExtensionIdSet& extension_ids) {
+    const ExtensionPrefs::ExtensionIds& extension_ids) {
   InitializePageOrdinalMap(extension_ids);
 
   MigrateAppIndex(extension_ids);
@@ -64,7 +64,7 @@ void ExtensionSorting::CreateOrdinalsIfNecessary(size_t minimum_size) {
 }
 
 void ExtensionSorting::MigrateAppIndex(
-    const ExtensionPrefs::ExtensionIdSet& extension_ids) {
+    const ExtensionPrefs::ExtensionIds& extension_ids) {
   if (extension_ids.empty())
     return;
 
@@ -74,7 +74,7 @@ void ExtensionSorting::MigrateAppIndex(
   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);
@@ -441,8 +441,8 @@ StringOrdinal ExtensionSorting::GetMinOrMaxAppLaunchOrdinalsOnPage(
 }
 
 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),

chrome/browser/extensions/extension_sorting.h

@@ -29,7 +29,7 @@ class ExtensionSorting {
   // Properly initialize ExtensionSorting internal values that require
   // |extension_ids|.
   void Initialize(
-      const extensions::ExtensionPrefs::ExtensionIdSet& extension_ids);
+      const extensions::ExtensionPrefs::ExtensionIds& extension_ids);
 
   // Resolves any conflicts the might be created as a result of syncing that
   // results in two icons having the same page and app launch ordinal. After
@@ -119,11 +119,11 @@ class ExtensionSorting {
   // Initialize the |page_ordinal_map_| with the page ordinals used by the
   // given extensions.
   void InitializePageOrdinalMap(
-      const extensions::ExtensionPrefs::ExtensionIdSet& extension_ids);
+      const extensions::ExtensionPrefs::ExtensionIds& extension_ids);
 
   // Migrates the app launcher and page index values.
   void MigrateAppIndex(
-      const extensions::ExtensionPrefs::ExtensionIdSet& extension_ids);
+      const extensions::ExtensionPrefs::ExtensionIds& extension_ids);
 
   // Called to add a new mapping value for |extension_id| with a page ordinal
   // of |page_ordinal| and a app launch ordinal of |app_launch_ordinal|. This

chrome/browser/extensions/extension_sorting_unittest.cc

@@ -171,7 +171,7 @@ class ExtensionSortingInitialize
 
     // We insert the ids in reserve order so that we have to deal with the
     // element on the 2nd page before the 1st page is seen.
-    extensions::ExtensionPrefs::ExtensionIdSet ids;
+    extensions::ExtensionPrefs::ExtensionIds ids;
     ids.push_back(ext3_->id());
     ids.push_back(ext2_->id());
     ids.push_back(ext1_->id());
@@ -217,7 +217,7 @@ class ExtensionSortingInitializeWithNoApps
     extension_sorting->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId,
                                            initial_ordinal);
 
-    extensions::ExtensionPrefs::ExtensionIdSet ids;
+    extensions::ExtensionPrefs::ExtensionIds ids;
     extension_sorting->Initialize(ids);
   }
   virtual void Verify() OVERRIDE {
@@ -269,7 +269,7 @@ class ExtensionSortingMigrateAppIndexInvalid
                                       kPrefPageIndexDeprecated,
                                       Value::CreateIntegerValue(-1));
 
-    extensions::ExtensionPrefs::ExtensionIdSet ids;
+    extensions::ExtensionPrefs::ExtensionIds ids;
     ids.push_back(ext1_->id());
 
     prefs()->extension_sorting()->Initialize(ids);

chrome/browser/extensions/extension_toolbar_model.cc

@@ -271,9 +271,9 @@ void ExtensionToolbarModel::InitializeExtensionLists() {
 }
 
 void ExtensionToolbarModel::PopulateForActionBoxMode() {
-  const extensions::ExtensionPrefs::ExtensionIdSet toolbar_order =
+  const extensions::ExtensionPrefs::ExtensionIds toolbar_order =
       service_->extension_prefs()->GetToolbarOrder();
-  extensions::ExtensionPrefs::ExtensionIdSet action_box_order =
+  extensions::ExtensionPrefs::ExtensionIds action_box_order =
       service_->extension_prefs()->GetActionBoxOrder();
 
   // Add all browser actions not already in the toolbar or action box
@@ -300,7 +300,7 @@ void ExtensionToolbarModel::PopulateForActionBoxMode() {
 }
 
 void ExtensionToolbarModel::PopulateForNonActionBoxMode() {
-  const extensions::ExtensionPrefs::ExtensionIdSet pref_order =
+  const extensions::ExtensionPrefs::ExtensionIds pref_order =
       service_->extension_prefs()->GetToolbarOrder();
   // Items that have a pref for their position.
   ExtensionList sorted;
@@ -317,7 +317,7 @@ void ExtensionToolbarModel::PopulateForNonActionBoxMode() {
     if (!service_->extension_prefs()->GetBrowserActionVisibility(extension))
       continue;
 
-    extensions::ExtensionPrefs::ExtensionIdSet::const_iterator pos =
+    extensions::ExtensionPrefs::ExtensionIds::const_iterator pos =
         std::find(pref_order.begin(), pref_order.end(), extension->id());
     if (pos != pref_order.end())
       sorted[pos - pref_order.begin()] = extension;
@@ -350,7 +350,7 @@ void ExtensionToolbarModel::PopulateForNonActionBoxMode() {
 }
 
 void ExtensionToolbarModel::FillExtensionList(
-    const extensions::ExtensionPrefs::ExtensionIdSet& order,
+    const extensions::ExtensionPrefs::ExtensionIds& order,
     ExtensionList* list) {
   list->clear();
   list->reserve(order.size());
@@ -366,13 +366,13 @@ void ExtensionToolbarModel::UpdatePrefs() {
   if (!service_->extension_prefs())
     return;
 
-  extensions::ExtensionPrefs::ExtensionIdSet toolbar_ids;
+  extensions::ExtensionPrefs::ExtensionIds toolbar_ids;
   toolbar_ids.reserve(toolbar_items_.size());
   for (size_t i = 0; i < toolbar_items_.size(); ++i)
     toolbar_ids.push_back(toolbar_items_[i]->id());
   service_->extension_prefs()->SetToolbarOrder(toolbar_ids);
 
-  extensions::ExtensionPrefs::ExtensionIdSet action_box_ids;
+  extensions::ExtensionPrefs::ExtensionIds action_box_ids;
   action_box_ids.reserve(action_box_menu_items_.size());
   for (size_t i = 0; i < action_box_menu_items_.size(); ++i)
     action_box_ids.push_back(action_box_menu_items_[i]->id());

chrome/browser/extensions/extension_toolbar_model.h

@@ -101,7 +101,7 @@ class ExtensionToolbarModel : public content::NotificationObserver {
 
   // Fills |list| with extensions based on provided |order|.
   void FillExtensionList(
-      const extensions::ExtensionPrefs::ExtensionIdSet& order,
+      const extensions::ExtensionPrefs::ExtensionIds& order,
       extensions::ExtensionList* list);
 
   // Save the model to prefs.

chrome/browser/protector/protected_prefs_watcher.cc

@@ -209,7 +209,7 @@ bool ProtectedPrefsWatcher::UpdateCachedPrefs() {
       !extension_prefs_value->GetAsDictionary(&extension_prefs)) {
     return false;
   }
-  ExtensionPrefs::ExtensionIdSet extension_ids =
+  ExtensionPrefs::ExtensionIds extension_ids =
       ExtensionPrefs::GetExtensionsFrom(extension_prefs);
   if (extension_ids == cached_extension_ids_)
     return false;
@@ -236,7 +236,7 @@ void ProtectedPrefsWatcher::InitBackup() {
   ListPrefUpdate extension_ids_update(prefs, kBackupExtensionsIDs);
   base::ListValue* extension_ids = extension_ids_update.Get();
   extension_ids->Clear();
-  for (ExtensionPrefs::ExtensionIdSet::const_iterator it =
+  for (ExtensionPrefs::ExtensionIds::const_iterator it =
            cached_extension_ids_.begin();
        it != cached_extension_ids_.end(); ++it) {
     extension_ids->Append(base::Value::CreateStringValue(*it));
@@ -297,7 +297,7 @@ bool ProtectedPrefsWatcher::UpdateBackupEntry(const std::string& path) {
     ListPrefUpdate extension_ids_update(prefs, kBackupExtensionsIDs);
     base::ListValue* extension_ids = extension_ids_update.Get();
     extension_ids->Clear();
-    for (ExtensionPrefs::ExtensionIdSet::const_iterator it =
+    for (ExtensionPrefs::ExtensionIds::const_iterator it =
              cached_extension_ids_.begin();
          it != cached_extension_ids_.end(); ++it) {
       extension_ids->Append(base::Value::CreateStringValue(*it));

chrome/browser/protector/protected_prefs_watcher.h

@@ -91,7 +91,7 @@ class ProtectedPrefsWatcher : public content::NotificationObserver {
   std::string GetSignatureData(PrefService* prefs) const;
 
   // Cached set of extension IDs. They are not changed as frequently
-  extensions::ExtensionPrefs::ExtensionIdSet cached_extension_ids_;
+  extensions::ExtensionPrefs::ExtensionIds cached_extension_ids_;
 
   scoped_ptr<PrefSetObserver> pref_observer_;