Renderer initiated navigations from non instant process should not fall into instant.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index c51859e0ced7e6fcf7517e0c66d60202763e3211..2c3a6f8f5c30cfe8b454cc0e1ae7eb0e88912fec 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -434,35 +434,35 @@ int GetCrashSignalFD(const CommandLine& command_line) {
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
-// Transforms the input |url| into its "effective URL". The returned URL
+// Transforms the input |url| into its "privileged URL". The returned URL
 // facilitates grouping process-per-site. The |url| is transformed, for
 // example, from
 //
 //   https://www.google.com/search?espv=1&q=tractors
 //
-// to the effective URL
+// to the privileged URL
 //
 //   chrome-search://www.google.com/search?espv=1&q=tractors
 //
 // Notice the scheme change.
 //
-// If the input is already an effective URL then that same URL is returned.
-GURL GetEffectiveURLForInstant(const GURL& url, Profile* profile) {
+// If the input is already an privileged URL then that same URL is returned.
+GURL GetPrivilegedURLForInstant(const GURL& url, Profile* profile) {
   CHECK(chrome::ShouldAssignURLToInstantRenderer(url, profile))
       << "Error granting Instant access.";
 
   if (url.SchemeIs(chrome::kChromeSearchScheme))
     return url;
 
-  GURL effective_url(url);
+  GURL privileged_url(url);
 
   // Replace the scheme with "chrome-search:".
   url_canon::Replacements<char> replacements;
   std::string search_scheme(chrome::kChromeSearchScheme);
   replacements.SetScheme(search_scheme.data(),
                          url_parse::Component(0, search_scheme.length()));
-  effective_url = effective_url.ReplaceComponents(replacements);
-  return effective_url;
+  privileged_url = privileged_url.ReplaceComponents(replacements);
+  return privileged_url;
 }
 
 #if !defined(OS_CHROMEOS)
@@ -745,17 +745,39 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
   host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
 }
 
+GURL ChromeContentBrowserClient::GetPossiblyPrivilegedURL(
+    content::BrowserContext* browser_context,
+    const GURL& url,
+    bool is_renderer_initiated,
+    content::SiteInstance* current_instance) {
+  Profile* profile = Profile::FromBrowserContext(browser_context);
+  if (!profile)
+    return url;
+
+  // Only return the privileged instant URL if we are entering from a browser-
+  // initiated navigation or if we are already in the instant process.
+  bool is_instant_process = false;
+  int process_id = current_instance->GetProcess()->GetID();
+  InstantService* instant_service =
+      InstantServiceFactory::GetForProfile(profile);
+  if (instant_service)
+    is_instant_process = instant_service->IsInstantProcess(process_id);

[sreeram, 2013/05/01 18:00:57]

Do we need to check process ID? Couldn't we just check that |current_instance|
has the "chrome-search://" scheme?

[Charlie Reis, 2013/05/01 18:05:29]

In theory they should be equivalent.  I'd probably sleep better if we checked
for both.  :)

[Shishir, 2013/05/01 18:13:52]

Yes, they should be exactly the same. One subtle thing to note is that site gets
assigned to a SiteInstance earlier than the process (which is when the
InstantService is updated). I don't think it matters in our case, and we could
possibly dcheck that the origin is the privileged instant URL.

[sreeram, 2013/05/01 18:35:18]

Right, but that's for the _new_ SiteInstance, right? At the time we use
|current_instance|, we shouldn't be dealing with that situation (where the
process hasn't been assigned yet). Right?

So let's do both checks, as Charlie suggested. And DCHECK() that both checks
give the same value.

[Shishir, 2013/05/01 19:11:11]

Done.

+  if (!is_renderer_initiated || is_instant_process) {
+    // If the input |url| should be assigned to the Instant renderer, make its
+    // privileged URL distinct from other URLs on the search provider's domain.
+    if (chrome::ShouldAssignURLToInstantRenderer(url, profile))
+      return GetPrivilegedURLForInstant(url, profile);
+  }
+
+  return url;
+}
+
 GURL ChromeContentBrowserClient::GetEffectiveURL(
     content::BrowserContext* browser_context, const GURL& url) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile)
     return url;
 
-  // If the input |url| should be assigned to the Instant renderer, make its
-  // effective URL distinct from other URLs on the search provider's domain.
-  if (chrome::ShouldAssignURLToInstantRenderer(url, profile))
-    return GetEffectiveURLForInstant(url, profile);
-
 #if !defined(OS_CHROMEOS)
   // If the input |url| should be assigned to the Signin renderer, make its
   // effective URL distinct from other URLs on the signin service's domain.