Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_override_apitest.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_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 96 matching lines @@
     ResultCatcher catcher;
     // Navigate to the history page.  The overridden history page
     // will call chrome.test.notifyPass() .
     ui_test_utils::NavigateToURL(browser(), GURL("chrome://history/"));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 }
 
 // Regression test for http://crbug.com/41442.
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, ShouldNotCreateDuplicateEntries) {
-  const Extension* extension =
-      LoadExtension(test_data_dir_.AppendASCII("override/history"));
-  ASSERT_TRUE(extension);
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("override/history")));
 
   // 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(),
-        extension->GetChromeURLOverrides());
+        browser()->profile()->GetExtensionService()->extensions()->back()->
+            GetChromeURLOverrides());
   }
 
   ASSERT_TRUE(CheckHistoryOverridesContainsNoDupes());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, ShouldCleanUpDuplicateEntries) {
   // Simulate several LoadExtension() calls happening over the lifetime of
   // a preferences file without corresponding UnloadExtension() calls. This is
   // the same as the above test, except for that it is testing the case where
   // the file already contains dupes when an extension is loaded.
@@ skipping 17 matching lines @@
 #if defined(USE_VIRTUAL_KEYBOARD)
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideKeyboard) {
   ASSERT_TRUE(RunExtensionTest("override/keyboard")) << message_;
   {
     ResultCatcher catcher;
     NavigateToKeyboard();
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // Load the failing version.  This should take precedence.
-  const Extension* extension = LoadExtension(
-      test_data_dir_.AppendASCII("override").AppendASCII("keyboard_fails"));
-  ASSERT_TRUE(extension);
+  ASSERT_TRUE(LoadExtension(
+      test_data_dir_.AppendASCII("override").AppendASCII("keyboard_fails")));
   {
     ResultCatcher catcher;
     NavigateToKeyboard();
     ASSERT_FALSE(catcher.GetNextResult());
   }
 
   // Unload the failing version.  We should be back to passing now.
-  UnloadExtension(extension->id());
+  const ExtensionList *extensions =
+      browser()->profile()->GetExtensionService()->extensions();
+  UnloadExtension((*extensions->rbegin())->id());
   {
     ResultCatcher catcher;
     NavigateToKeyboard();
     ASSERT_TRUE(catcher.GetNextResult());
   }
 }
 #endif