Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 522 matching lines @@
 void LocationBarViewMac::RefreshPageActionDecorations() {
   if (!IsEditable()) {
     DeletePageActionDecorations();
     return;
   }
 
   ExtensionService* service = profile_->GetExtensionService();
   if (!service)
     return;
 
+  // Find all the page actions.
   std::vector<ExtensionAction*> page_actions;
-  for (size_t i = 0; i < service->extensions()->size(); ++i) {
-    if (service->extensions()->at(i)->page_action())
-      page_actions.push_back(service->extensions()->at(i)->page_action());
+  for (ExtensionSet::const_iterator it = service->extensions()->begin();
+       it != service->extensions()->end(); ++it) {
+    if ((*it)->page_action())
+      page_actions.push_back((*it)->page_action());
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any Page Actions) load.
   if (page_actions.size() != page_action_decorations_.size()) {
     DeletePageActionDecorations();  // Delete the old views (if any).
 
     for (size_t i = 0; i < page_actions.size(); ++i) {
       page_action_decorations_.push_back(
           new PageActionDecoration(this, profile_, page_actions[i]));
@@ skipping 84 matching lines @@
 
   [field_ setNeedsDisplay:YES];
 }
 
 bool LocationBarViewMac::IsStarEnabled() {
   return [field_ isEditable] &&
          browser_defaults::bookmarks_enabled &&
          !toolbar_model_->input_in_progress() &&
          edit_bookmarks_enabled_.GetValue();
 }