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

chrome/browser/chrome_content_browser_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/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 39 matching lines @@
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/resource_context.h"
 #include "content/browser/site_instance.h"
@@ skipping 101 matching lines @@
   // Default to a normal renderer cause it is lower privileged. This should only
   // occur if the URL on a site instance is either malformed, or uninitialized.
   // If it is malformed, then there is no need for better privileges anyways.
   // If it is uninitialized, but eventually settles on being an a scheme other
   // than normal webrenderer, the navigation logic will correct us out of band
   // anyways.
   if (!url.is_valid())
     return PRIV_NORMAL;
 
   if (url.SchemeIs(chrome::kExtensionScheme)) {
-    const Extension* extension = service->GetExtensionByURL(url);
+    const Extension* extension =
+        service->extensions()->GetByURL(ExtensionURLInfo(url));
     if (extension && extension->is_storage_isolated())
       return PRIV_ISOLATED;
     if (extension && extension->is_hosted_app())
       return PRIV_HOSTED;
 
     return PRIV_EXTENSION;
   }
 
   return PRIV_NORMAL;
 }
@@ skipping 177 matching lines @@
 GURL ChromeContentBrowserClient::GetEffectiveURL(
     content::BrowserContext* browser_context, const GURL& url) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   // Get the effective URL for the given actual URL. If the URL is part of an
   // installed app, the effective URL is an extension URL with the ID of that
   // extension as the host. This has the effect of grouping apps together in
   // a common SiteInstance.
   if (!profile || !profile->GetExtensionService())
     return url;
 
-  const Extension* extension =
-      profile->GetExtensionService()->GetExtensionByWebExtent(url);
+  const Extension* extension = profile->GetExtensionService()->extensions()->
+      GetByWebExtent(ExtensionURLInfo(url));
   if (!extension)
     return url;
 
   // Bookmark apps do not use the hosted app process model, and should be
   // treated as normal URLs.
   if (extension->from_bookmark())
     return url;
 
   // If the URL is part of an extension's web extent, convert it to an
   // extension URL.
   return extension->GetResourceURL(url.path());

[Aaron Boodman, 2011/12/09 16:05:20]

This is kinda funky. We could just return extension->url().

[Yoyo Zhou, 2011/12/09 19:59:09]

Doesn't that lose the path?

 }
 
 bool ChromeContentBrowserClient::ShouldUseProcessPerSite(
     content::BrowserContext* browser_context, const GURL& effective_url) {
   // Non-extension URLs should generally use process-per-site-instance.
   // Because we expect to use the effective URL, URLs for hosted apps (apart
   // from bookmark apps) should have an extension scheme by now.
   if (!effective_url.SchemeIs(chrome::kExtensionScheme))
     return false;
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile || !profile->GetExtensionService())
     return false;
 
-  const Extension* extension =
-      profile->GetExtensionService()->GetExtensionByURL(effective_url);
+  const Extension* extension = profile->GetExtensionService()->extensions()->
+      GetByURL(ExtensionURLInfo(effective_url));
   if (!extension)
     return false;
 
   // If the URL is part of a hosted app that does not have the background
   // permission, we want to give each instance its own process to improve
   // responsiveness.
   if (extension->GetType() == Extension::TYPE_HOSTED_APP &&
       !extension->HasAPIPermission(ExtensionAPIPermission::kBackground))
     return false;
 
@@ skipping 60 matching lines @@
     SiteInstance* site_instance) {
   CHECK(site_instance->HasProcess());
 
   Profile* profile = Profile::FromBrowserContext(
       site_instance->browsing_instance()->browser_context());
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return;
 
   const Extension* extension =
-      service->GetExtensionByURL(site_instance->site());
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(site_instance->site());
+      service->extensions()->GetByURL(ExtensionURLInfo(site_instance->site()));
   if (!extension)
     return;
 
   service->process_map()->Insert(extension->id(),
                                  site_instance->GetProcess()->GetID(),
                                  site_instance->id());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::RegisterExtensionProcess,
                  profile->GetExtensionInfoMap(),
                  extension->id(),
                  site_instance->GetProcess()->GetID(),
                  site_instance->id()));
 }
 
 void ChromeContentBrowserClient::SiteInstanceDeleting(
     SiteInstance* site_instance) {
   if (!site_instance->HasProcess())
     return;
 
   Profile* profile = Profile::FromBrowserContext(
       site_instance->browsing_instance()->browser_context());
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return;
 
   const Extension* extension =
-      service->GetExtensionByURL(site_instance->site());
-  if (!extension)
-    extension = service->GetExtensionByWebExtent(site_instance->site());
+      service->extensions()->GetByURL(ExtensionURLInfo(site_instance->site()));
   if (!extension)
     return;
 
   service->process_map()->Remove(extension->id(),
                                  site_instance->GetProcess()->GetID(),
                                  site_instance->id());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExtensionInfoMap::UnregisterExtensionProcess,
                  profile->GetExtensionInfoMap(),
@@ skipping 680 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome