Only commit cookie changes in prerenders after a prerender is shown

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
===================================================================
--- content/browser/renderer_host/render_process_host_impl.cc	(revision 265252)
+++ content/browser/renderer_host/render_process_host_impl.cc	(working copy)
@@ -1680,7 +1680,9 @@
     return false;
   }
 
-  return GetContentClient()->browser()->IsSuitableHost(host, site_url);
+  ContentBrowserClient* client = GetContentClient()->browser();

[Charlie Reis, 2014/05/07 17:21:32]

This change doesn't look necessary.

[tburkard, 2014/05/07 18:34:27]

Done.

+
+  return client->IsSuitableHost(host, site_url);
 }
 
 // static
@@ -1759,11 +1761,12 @@
 
   iterator iter(AllHostsIterator());
   while (!iter.IsAtEnd()) {
-    if (RenderProcessHostImpl::IsSuitableHost(
+    if (GetContentClient()->browser()->MayReuseHost(iter.GetCurrentValue()) &&

[Charlie Reis, 2014/05/07 17:21:32]

Wait, this is on the UI thread, not the IO thread.  Is the comment in
ChromeContentBrowserClient incorrect?

[tburkard, 2014/05/07 18:34:27]

resolved per prior comments.

+        RenderProcessHostImpl::IsSuitableHost(
             iter.GetCurrentValue(),
-            browser_context, site_url))
+            browser_context, site_url)) {
       suitable_renderers.push_back(iter.GetCurrentValue());
-
+    }
     iter.Advance();
   }
 
@@ -1816,7 +1819,9 @@
   std::string site = SiteInstance::GetSiteForURL(browser_context, url)
       .possibly_invalid_spec();
   RenderProcessHost* host = map->FindProcess(site);
-  if (host && !IsSuitableHost(host, browser_context, url)) {
+  if (host && (
+          (!GetContentClient()->browser()->MayReuseHost(host)) ||

[Charlie Reis, 2014/05/07 17:21:32]

This is also on the UI thread.

[tburkard, 2014/05/07 18:34:27]

Resolved per prior comments.

+          (!IsSuitableHost(host, browser_context, url)))) {

[Charlie Reis, 2014/05/07 17:21:32]

Seems like there's some unnecessary parentheses here, making it harder to read.

[tburkard, 2014/05/07 18:34:27]

Done.

     // The registered process does not have an appropriate set of bindings for
     // the url.  Remove it from the map so we can register a better one.
     RecordAction(