Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

ExtensionManagementApiBrowserTest.LaunchApp fixed by r113141.

Make ExtensionSet iterate like a set instead of a map.

BUG=104091
TEST=existing tests

Review URL: http://codereview.chromium.org/8733004

TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8789018

TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8822021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113233 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc
index 518d333..778ec2e 100644
--- a/chrome/browser/extensions/extension_override_apitest.cc
+++ b/chrome/browser/extensions/extension_override_apitest.cc
@@ -114,15 +114,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideHistory) {
 
 // Regression test for http://crbug.com/41442.
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, ShouldNotCreateDuplicateEntries) {
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("override/history")));
+  const Extension* extension =
+      LoadExtension(test_data_dir_.AppendASCII("override/history"));
+  ASSERT_TRUE(extension);
 
   // Simulate several LoadExtension() calls happening over the lifetime of
   // a preferences file without corresponding UnloadExtension() calls.
   for (size_t i = 0; i < 3; ++i) {
     ExtensionWebUI::RegisterChromeURLOverrides(
         browser()->profile(),
-        browser()->profile()->GetExtensionService()->extensions()->back()->
-            GetChromeURLOverrides());
+        extension->GetChromeURLOverrides());
   }
 
   ASSERT_TRUE(CheckHistoryOverridesContainsNoDupes());
@@ -160,8 +161,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideKeyboard) {
   }
 
   // Load the failing version.  This should take precedence.
-  ASSERT_TRUE(LoadExtension(
-      test_data_dir_.AppendASCII("override").AppendASCII("keyboard_fails")));
+  const Extension* extension = LoadExtension(
+      test_data_dir_.AppendASCII("override").AppendASCII("keyboard_fails"));
+  ASSERT_TRUE(extension);
   {
     ResultCatcher catcher;
     NavigateToKeyboard();
@@ -169,9 +171,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideKeyboard) {
   }
 
   // Unload the failing version.  We should be back to passing now.
-  const ExtensionList *extensions =
-      browser()->profile()->GetExtensionService()->extensions();
-  UnloadExtension((*extensions->rbegin())->id());
+  UnloadExtension(extension->id());
   {
     ResultCatcher catcher;
     NavigateToKeyboard();