Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_tab_helper.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_tab_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
@@ skipping 80 matching lines @@
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(tab_contents()->browser_context());
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return;
 
-  for (size_t i = 0; i < service->extensions()->size(); ++i) {
-    ExtensionAction* browser_action =
-        service->extensions()->at(i)->browser_action();
+  for (ExtensionSet::const_iterator it = service->extensions()->begin();
+       it != service->extensions()->end(); ++it) {
+    ExtensionAction* browser_action = (*it)->browser_action();
     if (browser_action) {
       browser_action->ClearAllValuesForTab(
           wrapper_->restore_tab_helper()->session_id().id());
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
           content::Source<ExtensionAction>(browser_action),
           content::NotificationService::NoDetails());
     }
 
-    ExtensionAction* page_action =
-        service->extensions()->at(i)->page_action();
+    ExtensionAction* page_action = (*it)->page_action();
     if (page_action) {
       page_action->ClearAllValuesForTab(
           wrapper_->restore_tab_helper()->session_id().id());
       PageActionStateChanged();
     }
   }
 }
 
 bool ExtensionTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ skipping 156 matching lines @@
 }
 
 TabContents* ExtensionTabHelper::GetAssociatedTabContents() const {
   return tab_contents();
 }
 
 gfx::NativeView ExtensionTabHelper::GetNativeViewOfHost() {
   RenderWidgetHostView* rwhv = tab_contents()->GetRenderWidgetHostView();
   return rwhv ? rwhv->GetNativeView() : NULL;
 }