Change DoesSiteInfoRequireDedicatedProcess() param to SiteInfo.

This change converts the site_url param to a SiteInfo in preparation
for adding new checks that are based on other SiteInfo fields. This is
part of an ongoing effort to replace site URL usage in method
signatures with SiteInfo.

Bug: 1085275
Change-Id: I67cc62db168f1d107890f66970041796ea9dcb8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2401333
Commit-Queue: Aaron Colwell <acolwell@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Auto-Submit: Aaron Colwell <acolwell@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805520}

content/browser/site_instance_impl.cc

@@ -639,9 +639,8 @@ bool SiteInstanceImpl::IsSuitableForURL(const GURL& url) {
     // If the site URLs do not match, but neither this SiteInstance nor the
     // destination site_url require dedicated processes, then it is safe to use
     // this SiteInstance.
-    if (!RequiresDedicatedProcess() &&
-        !DoesSiteURLRequireDedicatedProcess(GetIsolationContext(),
-                                            site_info.site_url())) {
+    if (!RequiresDedicatedProcess() && !DoesSiteInfoRequireDedicatedProcess(
+                                           GetIsolationContext(), site_info)) {
       return true;
     }
 
@@ -660,8 +659,7 @@ bool SiteInstanceImpl::RequiresDedicatedProcess() {
   if (!has_site_)
     return false;
 
-  return DoesSiteURLRequireDedicatedProcess(GetIsolationContext(),
-                                            site_info_.site_url());
+  return DoesSiteInfoRequireDedicatedProcess(GetIsolationContext(), site_info_);
 }
 
 void SiteInstanceImpl::IncrementActiveFrameCount() {
@@ -1177,8 +1175,7 @@ bool SiteInstanceImpl::CanBePlacedInDefaultSiteInstance(
 
   // Allow the default SiteInstance to be used for sites that don't need to be
   // isolated in their own process.
-  return !DoesSiteURLRequireDedicatedProcess(isolation_context,
-                                             site_info.site_url());
+  return !DoesSiteInfoRequireDedicatedProcess(isolation_context, site_info);
 }
 
 // static
@@ -1209,16 +1206,15 @@ bool SiteInstanceImpl::DoesSiteRequireDedicatedProcess(
     const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return SiteIsolationPolicy::UseDedicatedProcessesForAllSites() ||
-         DoesSiteURLRequireDedicatedProcess(
+         DoesSiteInfoRequireDedicatedProcess(
              isolation_context,
-             SiteInstanceImpl::ComputeSiteInfo(isolation_context, url)
-                 .site_url());
+             SiteInstanceImpl::ComputeSiteInfo(isolation_context, url));
 }
 
 // static
-bool SiteInstanceImpl::DoesSiteURLRequireDedicatedProcess(
+bool SiteInstanceImpl::DoesSiteInfoRequireDedicatedProcess(
     const IsolationContext& isolation_context,
-    const GURL& site_url) {
+    const SiteInfo& site_info) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(isolation_context.browser_or_resource_context());
 
@@ -1226,6 +1222,8 @@ bool SiteInstanceImpl::DoesSiteURLRequireDedicatedProcess(
   if (SiteIsolationPolicy::UseDedicatedProcessesForAllSites())
     return true;
 
+  const GURL& site_url = site_info.site_url();
+
   // Always require a dedicated process for isolated origins.
   auto* policy = ChildProcessSecurityPolicyImpl::GetInstance();
   if (policy->IsIsolatedOrigin(isolation_context,
@@ -1266,15 +1264,13 @@ bool SiteInstanceImpl::ShouldLockProcess(
       isolation_context.browser_or_resource_context().ToBrowserContext();
   DCHECK(browser_context);
 
-  const GURL& site_url = site_info.site_url();
-
   // Don't lock to origin in --single-process mode, since this mode puts
   // cross-site pages into the same process.  Note that this also covers the
   // single-process mode in Android Webview.
   if (RenderProcessHost::run_renderer_in_process())
     return false;
 
-  if (!DoesSiteURLRequireDedicatedProcess(isolation_context, site_url))
+  if (!DoesSiteInfoRequireDedicatedProcess(isolation_context, site_info))
     return false;
 
   // Guest processes cannot be locked to their site because guests always have
@@ -1285,6 +1281,8 @@ bool SiteInstanceImpl::ShouldLockProcess(
   if (is_guest)
     return false;
 
+  const GURL& site_url = site_info.site_url();
+
   // Most WebUI processes should be locked on all platforms.  The only exception
   // is NTP, handled via the separate callout to the embedder.
   const auto& webui_schemes = URLDataManagerBackend::GetWebUISchemes();

content/browser/site_instance_impl.h

@@ -572,15 +572,15 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
   // URLs.
   static bool HasEffectiveURL(BrowserContext* browser_context, const GURL& url);
 
-  // Returns true if pages loaded from |site_url| ought to be handled only by a
+  // Returns true if pages loaded from |site_info| ought to be handled only by a
   // renderer process isolated from other sites. If --site-per-process is used,
   // this is true for all sites. In other site isolation modes, only a subset
   // of sites will require dedicated processes.
-  // Note: Unlike DoesSiteRequireDedicatedProcess(), this method expects a site
-  // URL instead of a plain URL.
-  static bool DoesSiteURLRequireDedicatedProcess(
+  // Note: Unlike DoesSiteRequireDedicatedProcess(), this method expects a
+  // SiteInfo instead of a plain URL.
+  static bool DoesSiteInfoRequireDedicatedProcess(
       const IsolationContext& isolation_context,
-      const GURL& site_url);
+      const SiteInfo& site_info);
 
   // Returns true if |url| and its |site_url| can be placed inside a default
   // SiteInstance.