Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_toolbar_model.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/extensions/extension_toolbar_model.h"
 
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 163 matching lines @@
 
   std::vector<std::string> pref_order = service_->extension_prefs()->
       GetToolbarOrder();
   // Items that have a pref for their position.
   ExtensionList sorted;
   sorted.resize(pref_order.size(), NULL);
   // The items that don't have a pref for their position.
   ExtensionList unsorted;
 
   // Create the lists.
-  for (ExtensionSet::const_iterator it = service_->extensions()->begin();
-       it != service_->extensions()->end(); ++it) {
-    const Extension* extension = *it;
+  for (size_t i = 0; i < service_->extensions()->size(); ++i) {
+    const Extension* extension = service_->extensions()->at(i);
     if (!extension->browser_action())
       continue;
     if (!service_->GetBrowserActionVisibility(extension))
       continue;
 
     std::vector<std::string>::iterator pos =
         std::find(pref_order.begin(), pref_order.end(), extension->id());
     if (pos != pref_order.end()) {
       int index = std::distance(pref_order.begin(), pos);
       sorted[index] = extension;
@@ skipping 55 matching lines @@
   int incognito_index = 0, i = 0;
   for (ExtensionList::iterator iter = begin(); iter != end();
        ++iter, ++i) {
     if (original_index == i)
       break;
     if (service_->IsIncognitoEnabled((*iter)->id()))
       ++incognito_index;
   }
   return incognito_index;
 }