Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_startup_browsertest.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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 65 matching lines @@
 
     InProcessBrowserTest::TearDown();
   }
 
   void WaitForServicesToStart(int num_expected_extensions,
                               bool expect_extensions_enabled) {
     ExtensionService* service = browser()->profile()->GetExtensionService();
 
     // 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));
     ASSERT_EQ(expect_extensions_enabled, service->extensions_enabled());
 
     ui_test_utils::WindowedNotificationObserver user_scripts_observer(
         chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
         content::NotificationService::AllSources());
     UserScriptMaster* master = browser()->profile()->GetUserScriptMaster();
@@ skipping 58 matching lines @@
 #if defined(OS_MACOSX)
 #define MAYBE_NoFileAccess DISABLED_NoFileAccess
 #else
 #define MAYBE_NoFileAccess NoFileAccess
 #endif
 // Tests that disallowing file access on an extension prevents it from injecting
 // script into a page with a file URL.
 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) {
   WaitForServicesToStart(num_expected_extensions_, true);
 
+  // Keep a separate list of extensions for which to disable file access, since
+  // doing so reloads them.
+  std::vector<const Extension*> extension_list;
+
   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))) {
-      ui_test_utils::WindowedNotificationObserver user_scripts_observer(
-          chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
-          content::NotificationService::AllSources());
-      service->SetAllowFileAccess(service->extensions()->at(i), false);
-      user_scripts_observer.Wait();
-    }
+    if (service->AllowFileAccess(*it))
+      extension_list.push_back(*it);
+  }
+
+  for (size_t i = 0; i < extension_list.size(); ++i) {
+    ui_test_utils::WindowedNotificationObserver user_scripts_observer(
+        chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
+        content::NotificationService::AllSources());
+    service->SetAllowFileAccess(extension_list[i], false);
+    user_scripts_observer.Wait();
   }
 
   TestInjection(false, false);
 }
 
 // ExtensionsLoadTest
 // Ensures that we can startup the browser with --load-extension and see them
 // run.
 
 class ExtensionsLoadTest : public ExtensionStartupTestBase {
@@ skipping 14 matching lines @@
 #if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
 #define Maybe_Test FLAKY_Test
 #else
 #define Maybe_Test Test
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Maybe_Test) {
   WaitForServicesToStart(1, true);
   TestInjection(true, true);
 }