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

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 416 matching lines @@
   if (process_type == switches::kPpapiPluginProcess)
     return PpapiCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
 
   if (process_type == switches::kGpuProcess)
     return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket();
 
   return -1;
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
-// Transforms the input |url| into its "effective 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
-//
-//   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) {
-  CHECK(chrome::ShouldAssignURLToInstantRenderer(url, profile))
-      << "Error granting Instant access.";
-
-  if (url.SchemeIs(chrome::kChromeSearchScheme))
-    return url;
-
-  GURL effective_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;
-}
-
 #if !defined(OS_CHROMEOS)
 GURL GetEffectiveURLForSignin(const GURL& url) {
   CHECK(SigninManager::IsWebBasedSigninFlowURL(url));
 
   GURL effective_url(SigninManager::kChromeSigninEffectiveSite);
   // Copy the path because the argument to SetPathStr must outlive
   // the Replacements object.
   const std::string path_copy(url.path());
   GURL::Replacements replacements;
   replacements.SetPathStr(path_copy);
@@ skipping 260 matching lines @@
   host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled(
       IsExtensionActivityLogEnabledForProfile(profile)));
 
   SendExtensionWebRequestStatusToHost(host);
 
   RendererContentSettingRules rules;
   GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
   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);
+
+  // TODO(shishir): Uncomment the followng DCHECK after tests are fixed.

[Charlie Reis, 2013/05/02 17:25:20]

Is the ReplaceSearchTerms CL difficult to fix?  It would be much better to just
fix it and land this with the DCHECK in place if possible.

If that's going to put M28 at risk, then we should at least call out the
specific failing test in the TODO (and fix the typo in "followng").

[Shishir, 2013/05/02 18:07:07]

Fixed the test. Turns out the code that caused this DCHECK to fail was not even
necessary.

[Charlie Reis, 2013/05/02 18:33:02]

Fantastic!  LGTM.

+  // DCHECK_EQ(is_instant_process,
+  //         chrome::IsPrivilegedURLForInstant(current_instance->GetSiteURL()));
+  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 chrome::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.
   // Note that the signin renderer will be allowed to sign the user in to
   // Chrome.
   if (SigninManager::IsWebBasedSigninFlowURL(url))
     return GetEffectiveURLForSignin(url);
 #endif
 
   // If the input |url| is part of an installed app, the effective URL is an
@@ skipping 1478 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return chrome::NewCryptoModuleBlockingDialogDelegate(
       chrome::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome