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 727 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* curr_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 = curr_instance->GetProcess()->GetID();
+  InstantService* instant_service =
+      InstantServiceFactory::GetForProfile(profile);
+  if (instant_service)
+    is_instant_process = instant_service->IsInstantProcess(process_id);
+  if (!is_renderer_initiated || is_instant_process) {
+    // 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.

[Charlie Reis, 2013/05/01 01:17:54]

s/effective/privileged/

[Shishir, 2013/05/01 07:56:14]

Done.

+    if (chrome::ShouldAssignURLToInstantRenderer(url, profile))
+      return GetEffectiveURLForInstant(url, profile);

[Charlie Reis, 2013/05/01 01:17:54]

We should rename this to GetPrivilegedURLForInstant, since we're no longer using
the "effective URL" system.

[Shishir, 2013/05/01 07:56:14]

Done.

+  }
+
+  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