Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_startup_browsertest.cc

Index: chrome/browser/extensions/extension_startup_browsertest.cc
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 835d274b4a622622f3273b12d8f9e15b15f9a881..8b29ce10670bf5c06730593ea5a1f6736031d972 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -83,9 +83,11 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
 
     // Count the number of non-component extensions.
     int found_extensions = 0;
-    for (size_t i = 0; i < service->extensions()->size(); i++)
-      if (service->extensions()->at(i)->location() != Extension::COMPONENT)
+    for (ExtensionSet::const_iterator it = service->extensions()->begin();
+         it != service->extensions()->end(); ++it) {
+      if ((*it)->location() != Extension::COMPONENT)
         found_extensions++;
+    }
 
     ASSERT_EQ(static_cast<uint32>(num_expected_extensions),
               static_cast<uint32>(found_extensions));
@@ -164,14 +166,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) {
   WaitForServicesToStart(num_expected_extensions_, true);
 
   ExtensionService* service = browser()->profile()->GetExtensionService();
-  for (size_t i = 0; i < service->extensions()->size(); ++i) {
-    if (service->extensions()->at(i)->location() == Extension::COMPONENT)
+  for (ExtensionSet::const_iterator it = service->extensions()->begin();
+       it != service->extensions()->end(); ++it) {
+    if ((*it)->location() == Extension::COMPONENT)
       continue;
-    if (service->AllowFileAccess(service->extensions()->at(i))) {
+    if (service->AllowFileAccess(*it)) {
       ui_test_utils::WindowedNotificationObserver user_scripts_observer(
           chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
           content::NotificationService::AllSources());
-      service->SetAllowFileAccess(service->extensions()->at(i), false);
+      service->SetAllowFileAccess(*it, false);
       user_scripts_observer.Wait();
     }
   }