Renamed ExtensionIdSet to ExtensionIds

chrome/browser/extensions/extension_toolbar_model.cc

Index: chrome/browser/extensions/extension_toolbar_model.cc
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index dc1e4a4ea098a1fab9dad05c366bd6ddd4725f17..13c5e3ff144d83b52f9269326fb36711811a0260 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/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());