Do not commit InstantLoader server redirects till the page supports instant.

chrome/browser/instant/instant_controller.cc

Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 83624cdc549af5c861ee12da890f6847c23813f6..f0b8db415a519ff1859ea311a80f8b27e7844562 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -869,9 +869,16 @@ void InstantController::InstantLoaderRenderViewGone() {
   CreateDefaultLoader();
 }
 
-void InstantController::InstantLoaderAboutToNavigateMainFrame(const GURL& url) {
+void InstantController::InstantLoaderAboutToNavigateMainFrame(
+    const GURL& url,
+    bool is_server_redirect) {
   GURL instant_url(loader_->instant_url());
 
+  // If the page does not yet support instant, we allow redirects to go through
+  // since the instant URL can redirect - e.g. to country specific pages.
+  if (!loader_->supports_instant() && is_server_redirect)
+    return;

[sreeram, 2013/01/08 00:50:03]

Put this before the GURL declaration above, so we avoid the object construction
if this condition is hit.

Also, do we really need to have this bool passed to us? What would go wrong if
we just did this:

if (!loader_->supports_instant())
  return;

If that works, you can get rid of all the other code in this CL, no?

[Shishir, 2013/01/08 01:01:12]

Forgot that the instant page had to call show to show up initially.

All Done.

+
   // If we are navigating to the instant URL, do nothing.
   if (url == instant_url)
     return;