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

chrome/browser/instant/instant_loader.cc

 // Copyright 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/instant/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ipc/ipc_message.h"
 
 namespace {
 
 int kUserDataKey;
 
 class InstantLoaderUserData : public base::SupportsUserData::Data {
  public:
@@ skipping 287 matching lines @@
 void InstantLoader::StopCapturingKeyStrokes() {
   InstantSupportDetermined(true);
   controller_->StopCapturingKeyStrokes();
 }
 
 void InstantLoader::RenderViewGone() {
   controller_->InstantLoaderRenderViewGone();
 }
 
 void InstantLoader::AboutToNavigateMainFrame(const GURL& url) {
-  controller_->InstantLoaderAboutToNavigateMainFrame(url);
+  controller_->InstantLoaderAboutToNavigateMainFrame(
+      url, url == expected_redirect_);
+  expected_redirect_ = GURL();
 }
 
 void InstantLoader::NavigateToURL(const GURL& url,
                                   content::PageTransition transition) {
   InstantSupportDetermined(true);
   controller_->NavigateToURL(url, transition);
 }
 
 void InstantLoader::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
+  if (type == content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT) {
+    content::ResourceRedirectDetails* resource_redirect_details =
+        content::Details<content::ResourceRedirectDetails>(details).ptr();
+    if (resource_redirect_details->resource_type == ResourceType::MAIN_FRAME)
+      expected_redirect_ = resource_redirect_details->new_url;
+  }
+
 #if defined(OS_MACOSX)
   if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
     if (content::RenderWidgetHostView* rwhv =
             contents_->GetRenderWidgetHostView())
       rwhv->SetTakesFocusOnlyOnMouseDown(true);
     return;
   }
   NOTREACHED();
 #endif
 }
@@ skipping 39 matching lines @@
 #if defined(OS_MACOSX)
   // If |contents_| doesn't yet have a RWHV, SetTakesFocusOnlyOnMouseDown() will
   // be called later, when NOTIFICATION_RENDER_VIEW_HOST_CHANGED is received.
   if (content::RenderWidgetHostView* rwhv =
           contents_->GetRenderWidgetHostView())
     rwhv->SetTakesFocusOnlyOnMouseDown(true);
   registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                  content::Source<content::NavigationController>(
                      &contents_->GetController()));
 #endif
+
+  registrar_.Add(this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
+                 content::Source<content::WebContents>(contents()));
 }
 
 void InstantLoader::CleanupPreviewContents() {
   client_.SetContents(NULL);
   contents_->RemoveUserData(&kUserDataKey);
   contents_->SetDelegate(NULL);
 
   // Undo tab helper work done in SetupPreviewContents().
 
   BlockedContentTabHelper::FromWebContents(contents())->
@@ skipping 20 matching lines @@
                                            content::WebContents* new_contents) {
   DCHECK_EQ(old_contents, contents());
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the WebContents.
   ignore_result(contents_.release());
   contents_.reset(new_contents);
   SetupPreviewContents();
   controller_->SwappedWebContents();
 }