Revert 262846, as the revert has now been merged to M35.

trunk/src/chrome/renderer/net/net_error_helper.h

 // Copyright (c) 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.
 
 #ifndef CHROME_RENDERER_NET_NET_ERROR_HELPER_H_
 #define CHROME_RENDERER_NET_NET_ERROR_HELPER_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/common/localized_error.h"
 #include "chrome/common/net/net_error_info.h"
 #include "chrome/renderer/net/net_error_helper_core.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
 #include "content/public/renderer/render_process_observer.h"
 
 class GURL;
 
 namespace content {
 class ResourceFetcher;
@@ skipping 41 matching lines @@
                     const blink::WebURLError& error,
                     bool is_failed_post,
                     std::string* error_html);
 
   // Returns whether a load for |url| in |frame| should have its error page
   // suppressed.
   bool ShouldSuppressErrorPage(blink::WebFrame* frame, const GURL& url);
 
  private:
   // NetErrorHelperCore::Delegate implementation:
-  virtual void GenerateLocalizedErrorPage(const blink::WebURLError& error,
-                                          bool is_failed_post,
-                                          std::string* html) const OVERRIDE;
+  virtual void GenerateLocalizedErrorPage(
+      const blink::WebURLError& error,
+      bool is_failed_post,
+      scoped_ptr<LocalizedError::ErrorPageParams> params,
+      std::string* html) const OVERRIDE;
   virtual void LoadErrorPageInMainFrame(const std::string& html,
                                         const GURL& failed_url) OVERRIDE;
   virtual void EnableStaleLoadBindings(const GURL& page_url) OVERRIDE;
   virtual void UpdateErrorPage(const blink::WebURLError& error,
                                bool is_failed_post) OVERRIDE;
-  virtual void FetchErrorPage(const GURL& url) OVERRIDE;
-  virtual void CancelFetchErrorPage() OVERRIDE;
+  virtual void FetchNavigationCorrections(
+      const GURL& navigation_correction_url,
+      const std::string& navigation_correction_request_body) OVERRIDE;
+  virtual void CancelFetchNavigationCorrections() OVERRIDE;
   virtual void ReloadPage() OVERRIDE;
 
   void OnNetErrorInfo(int status);
-  void OnSetAltErrorPageURL(const GURL& alternate_error_page_url);
+  void OnSetNavigationCorrectionInfo(const GURL& navigation_correction_url,
+                                     const std::string& language,
+                                     const std::string& country_code,
+                                     const std::string& api_key,
+                                     const GURL& search_url);
 
-  void OnAlternateErrorPageRetrieved(const blink::WebURLResponse& response,
-                                     const std::string& data);
+  void OnNavigationCorrectionsFetched(const blink::WebURLResponse& response,
+                                      const std::string& data);
 
-  scoped_ptr<content::ResourceFetcher> alt_error_page_fetcher_;
+  scoped_ptr<content::ResourceFetcher> correction_fetcher_;
 
   NetErrorHelperCore core_;
 
   DISALLOW_COPY_AND_ASSIGN(NetErrorHelper);
 };
 
 #endif  // CHROME_RENDERER_NET_NET_ERROR_HELPER_H_