Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_context_menu_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 "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 138 matching lines @@
   }
 
   // Shortcut to return the current ExtensionMenuManager.
   ExtensionMenuManager* menu_manager() {
     return browser()->profile()->GetExtensionService()->menu_manager();
   }
 
   // Returns a pointer to the currently loaded extension with |name|, or null
   // if not found.
   const Extension* GetExtensionNamed(std::string name) {
-    const ExtensionList* extensions =
+    const ExtensionSet* extensions =
         browser()->profile()->GetExtensionService()->extensions();
-    ExtensionList::const_iterator i;
+    ExtensionSet::const_iterator i;
     for (i = extensions->begin(); i != extensions->end(); ++i) {
       if ((*i)->name() == name) {
         return *i;
       }
     }
     return NULL;
   }
 
   // This gets all the items that any extension has registered for possible
   // inclusion in context menus.
@@ skipping 288 matching lines @@
   ASSERT_TRUE(MenuHasItemWithLabel(
       page_url, GURL(), no_frame_url, std::string("Page item")));
   ASSERT_FALSE(MenuHasItemWithLabel(
       page_url, GURL(), no_frame_url, std::string("Frame item")));
 
   ASSERT_TRUE(MenuHasItemWithLabel(
       page_url, GURL(), frame_url, std::string("Page item")));
   ASSERT_TRUE(MenuHasItemWithLabel(
       page_url, GURL(), frame_url, std::string("Frame item")));
 }