PlzNavigate: ensure we don't create extra-processes for ServiceWorkers

content/browser/site_instance_impl.cc

 // Copyright (c) 2012 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 "content/browser/site_instance_impl.h"
 
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/debug_urls.h"
 #include "content/browser/frame_host/frame_tree_node.h"
@@ skipping 26 matching lines @@
   GetContentClient()->browser()->SiteInstanceDeleting(this);
 
   if (process_)
     process_->RemoveObserver(this);
 
   // Now that no one is referencing us, we can safely remove ourselves from
   // the BrowsingInstance.  Any future visits to a page from this site
   // (within the same BrowsingInstance) can safely create a new SiteInstance.
   if (has_site_)
     browsing_instance_->UnregisterSiteInstance(this);
+  browsing_instance_->UnregisterUsedFor(this, sites_displayed_);
 }
 
 scoped_refptr<SiteInstanceImpl> SiteInstanceImpl::Create(
     BrowserContext* browser_context) {
   return make_scoped_refptr(
       new SiteInstanceImpl(new BrowsingInstance(browser_context)));
 }
 
 scoped_refptr<SiteInstanceImpl> SiteInstanceImpl::CreateForURL(
     BrowserContext* browser_context,
     const GURL& url) {
   // This will create a new SiteInstance and BrowsingInstance.
   scoped_refptr<BrowsingInstance> instance(
       new BrowsingInstance(browser_context));
   return instance->GetSiteInstanceForURL(url);
 }
 
+// static
+scoped_refptr<SiteInstanceImpl> SiteInstanceImpl::FindOrCreateForURL(
+    BrowserContext* browser_context,
+    const GURL& url) {
+  scoped_refptr<SiteInstanceImpl> instance_found =
+      BrowsingInstance::FindSiteInstance(browser_context, url);
+  if (instance_found)
+    return instance_found;
+  return CreateForURL(browser_context, url);
+}
+
 int32_t SiteInstanceImpl::GetId() {
   return id_;
 }
 
 bool SiteInstanceImpl::HasProcess() const {
   if (process_ != NULL)
     return true;
 
   // If we would use process-per-site for this site, also check if there is an
   // existing process that we would use if GetProcess() were called.
@@ skipping 188 matching lines @@
 }
 
 const GURL& SiteInstanceImpl::GetSiteURL() const {
   return site_;
 }
 
 bool SiteInstanceImpl::HasSite() const {
   return has_site_;
 }
 
+void SiteInstanceImpl::UsedFor(const GURL& url) {
+  std::string site = GetSiteForURL(browsing_instance_->browser_context_, url)
+                         .possibly_invalid_spec();
+  sites_displayed_.insert(site);
+  browsing_instance_->RegisterUsedFor(this, site);
+}
+
 bool SiteInstanceImpl::HasRelatedSiteInstance(const GURL& url) {
   return browsing_instance_->HasSiteInstance(url);
 }
 
 scoped_refptr<SiteInstance> SiteInstanceImpl::GetRelatedSiteInstance(
     const GURL& url) {
   return browsing_instance_->GetSiteInstanceForURL(url);
 }
 
 bool SiteInstanceImpl::IsRelatedSiteInstance(const SiteInstance* instance) {
@@ skipping 239 matching lines @@
             browsing_instance_->browser_context(), site_))
       return;
 
     ChildProcessSecurityPolicyImpl* policy =
         ChildProcessSecurityPolicyImpl::GetInstance();
     policy->LockToOrigin(process_->GetID(), site_);
   }
 }
 
 }  // namespace content