Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

chrome/browser/extensions/extension_web_ui.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_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/string_util.h"
@@ skipping 49 matching lines @@
   ExtensionWebUIImageLoadingTracker(Profile* profile,
                                     FaviconService::GetFaviconRequest* request,
                                     const GURL& page_url)
       : ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
         request_(request),
         extension_(NULL) {
     // Even when the extensions service is enabled by default, it's still
     // disabled in incognito mode.
     ExtensionService* service = profile->GetExtensionService();
     if (service)
-      extension_ = service->GetExtensionByURL(page_url);
+      extension_ = service->extensions()->GetByID(page_url.host());
   }
 
   void Init() {
     if (extension_) {
       ExtensionResource icon_resource =
           extension_->GetIconResource(Extension::EXTENSION_ICON_BITTY,
                                       ExtensionIconSet::MATCH_EXACTLY);
 
       tracker_.LoadImage(extension_, icon_resource,
                          gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize),
@@ skipping 42 matching lines @@
 
 const char ExtensionWebUI::kExtensionURLOverrides[] =
     "extensions.chrome_url_overrides";
 
 ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url)
     : ChromeWebUI(tab_contents),
       url_(url) {
   Profile* profile =
       Profile::FromBrowserContext(tab_contents->browser_context());
   ExtensionService* service = profile->GetExtensionService();
-  const Extension* extension = service->GetExtensionByURL(url);
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(url);
+  const Extension* extension =
+      service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(url));
   DCHECK(extension);
   // Only hide the url for internal pages (e.g. chrome-extension or packaged
   // component apps like bookmark manager.
   should_hide_url_ = !extension->is_hosted_app();
 
   // The base class defaults to enabling web ui bindings, but we don't need
   // those.
   bindings_ = 0;
 
   // Bind externalHost to Extension WebUI loaded in Chrome Frame.
@@ skipping 71 matching lines @@
     if (!url->ref().empty())
       override += "#" + url->ref();
     GURL extension_url(override);
     if (!extension_url.is_valid()) {
       NOTREACHED();
       UnregisterChromeURLOverride(page, profile, val);
       continue;
     }
 
     // Verify that the extension that's being referred to actually exists.
-    const Extension* extension = service->GetExtensionByURL(extension_url);
+    const Extension* extension =
+        service->extensions()->GetByID(extension_url.host());
     if (!extension) {
       // This can currently happen if you use --load-extension one run, and
       // then don't use it the next.  It could also happen if an extension
       // were deleted directly from the filesystem, etc.
       LOG(WARNING) << "chrome URL override present for non-existant extension";
       UnregisterChromeURLOverride(page, profile, val);
       continue;
     }
 
     // We can't handle chrome-extension URLs in incognito mode unless the
@@ skipping 163 matching lines @@
 }
 
 // static
 void ExtensionWebUI::GetFaviconForURL(Profile* profile,
     FaviconService::GetFaviconRequest* request, const GURL& page_url) {
   // tracker deletes itself when done.
   ExtensionWebUIImageLoadingTracker* tracker =
       new ExtensionWebUIImageLoadingTracker(profile, request, page_url);
   tracker->Init();
 }