Revert 244407 "InstantExtended: remove dead code related to the ..."

trunk/src/chrome/browser/ui/search/instant_page.cc

 // Copyright 2013 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/ui/search/instant_page.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
@@ skipping 62 matching lines @@
     int64 /* frame_id */,
     const base::string16& frame_unique_name,
     bool is_main_frame,
     const GURL& url,
     content::PageTransition /* transition_type */,
     content::RenderViewHost* /* render_view_host */) {
   if (is_main_frame && ShouldProcessAboutToNavigateMainFrame())
     delegate_->InstantPageAboutToNavigateMainFrame(contents(), url);
 }
 
+void InstantPage::DidNavigateMainFrame(
+    const content::LoadCommittedDetails& details,
+    const content::FrameNavigateParams& /* params */) {
+  // A 204 can be sent by the search provider as a lightweight signal
+  // to fall back to the local page, and we obviously want to fall back
+  // if we get any response code that indicates an error.
+  if (details.http_status_code == 204 || details.http_status_code >= 400)
+    delegate_->InstantPageLoadFailed(contents());
+}
+
+void InstantPage::DidFailProvisionalLoad(
+    int64 /* frame_id */,
+    const base::string16& frame_unique_name,
+    bool is_main_frame,
+    const GURL& /* validated_url */,
+    int /* error_code */,
+    const base::string16& /* error_description */,
+    content::RenderViewHost* /* render_view_host */) {
+  if (is_main_frame)
+    delegate_->InstantPageLoadFailed(contents());
+}
+
 void InstantPage::ModelChanged(const SearchModel::State& old_state,
                                const SearchModel::State& new_state) {
   if (old_state.instant_support != new_state.instant_support)
     InstantSupportDetermined(new_state.instant_support == INSTANT_SUPPORT_YES);
 }
 
 void InstantPage::InstantSupportDetermined(bool supports_instant) {
   delegate_->InstantSupportDetermined(contents(), supports_instant);
 
   // If the page doesn't support Instant, stop listening to it.
   if (!supports_instant)
     ClearContents();
 }
 
 void InstantPage::ClearContents() {
   if (contents())
     SearchTabHelper::FromWebContents(contents())->model()->RemoveObserver(this);
 
   sender()->SetContents(NULL);
   Observe(NULL);
 }