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

chrome/renderer/chrome_content_renderer_client.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/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 456 matching lines @@
             break;
           }
         }
         break;
       }
     }
   }
 
   // Determine if the manifest URL is part of an extension.
   const Extension* extension =
-      extension_dispatcher_->extensions()->GetByURL(
+      extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
           ExtensionURLInfo(manifest_url));
   // Only component, unpacked, and Chrome Web Store extensions are allowed.
   bool allowed_extension = extension &&
       (extension->from_webstore() ||
       extension->location() == Extension::COMPONENT ||
       extension->location() == Extension::LOAD);
 
   // Block any other use of NaCl plugin, unless --enable-nacl is set.
   if (!allowed_extension && !enable_nacl)
     return false;
@@ skipping 53 matching lines @@
     std::string* error_html,
     string16* error_description) {
   const GURL failed_url = error.unreachableURL;
   const Extension* extension = NULL;
   const bool is_repost =
       error.reason == net::ERR_CACHE_MISS &&
       error.domain == WebString::fromUTF8(net::kErrorDomain) &&
       EqualsASCII(failed_request.httpMethod(), "POST");
 
   if (failed_url.is_valid() && !failed_url.SchemeIs(chrome::kExtensionScheme)) {
-    extension = extension_dispatcher_->extensions()->GetByURL(
+    extension = extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
         ExtensionURLInfo(failed_url));
   }
 
   if (error_html) {
     // Use a local error page.
     int resource_id;
     DictionaryValue error_strings;
     if (extension) {
       LocalizedError::GetAppErrorStrings(error, failed_url, extension,
                                          &error_strings);
@@ skipping 48 matching lines @@
   // which means that things like the back button won't trigger it.  Is that
   // OK?
   if (CrossesExtensionExtents(frame, url, is_initial_navigation)) {
     // Include the referrer in this case since we're going from a hosted web
     // page. (the packaged case is handled previously by the extension
     // navigation test)
     *send_referrer = true;
 
     if (is_content_initiated) {
       const Extension* extension =
-          extension_dispatcher_->extensions()->GetByURL(ExtensionURLInfo(url));
+          extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
+              ExtensionURLInfo(url));
       if (extension && extension->is_app()) {
         UMA_HISTOGRAM_ENUMERATION(
             extension_misc::kAppLaunchHistogram,
             extension_misc::APP_LAUNCH_CONTENT_NAVIGATION,
             extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
       }
     }
     return true;
   }
 
@@ skipping 96 matching lines @@
 }
 
 void ChromeContentRendererClient::SetExtensionDispatcher(
     ExtensionDispatcher* extension_dispatcher) {
   extension_dispatcher_.reset(extension_dispatcher);
 }
 
 const Extension* ChromeContentRendererClient::GetNonBookmarkAppExtension(
     const ExtensionSet* extensions, const GURL& url) {
   // Exclude bookmark apps, which do not use the app process model.
-  const Extension* extension = extensions->GetByURL(ExtensionURLInfo(url));
+  const Extension* extension = extensions->GetExtensionOrAppByURL(
+      ExtensionURLInfo(url));
   if (extension && extension->from_bookmark())
     extension = NULL;
   return extension;
 }
 
 bool ChromeContentRendererClient::CrossesExtensionExtents(
     WebFrame* frame,
     const GURL& new_url,
     bool is_initial_navigation) {
   const ExtensionSet* extensions = extension_dispatcher_->extensions();
   GURL old_url(frame->top()->document().url());
 
   // Determine if the new URL is an extension (excluding bookmark apps).
   const Extension* new_url_extension = GetNonBookmarkAppExtension(extensions,
                                                                   new_url);
 
   // If old_url is still empty and this is an initial navigation, then this is
   // a window.open operation.  We should look at the opener URL.
   if (is_initial_navigation && old_url.is_empty() && frame->opener()) {
     // If we're about to open a normal web page from a same-origin opener stuck
     // in an extension process, we want to keep it in process to allow the
     // opener to script it.
     WebDocument opener_document = frame->opener()->document();
     GURL opener_url = opener_document.url();
     WebSecurityOrigin opener_origin = opener_document.securityOrigin();
-    bool opener_is_extension_url = !!extensions->GetByURL(
+    bool opener_is_extension_url = !!extensions->GetExtensionOrAppByURL(
         ExtensionURLInfo(opener_origin, opener_url));
     WebSecurityOrigin opener = frame->opener()->document().securityOrigin();
     if (!new_url_extension &&
         !opener_is_extension_url &&
         extension_dispatcher_->is_extension_process() &&
         opener.canRequest(WebURL(new_url)))
       return false;
 
     // In all other cases, we want to compare against the top frame's URL (as
     // opposed to the opener frame's), since that's what determines the type of
@@ skipping 56 matching lines @@
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) {
   return allowed_socket_origins_.find(url.host()) !=
       allowed_socket_origins_.end();
 }
 
 }  // namespace chrome