Merge 262846 "Revert 255617, due to it not tracking use of the link doctor page."

chrome/renderer/net/net_error_helper.h

Index: chrome/renderer/net/net_error_helper.h
===================================================================
--- chrome/renderer/net/net_error_helper.h	(revision 263850)
+++ chrome/renderer/net/net_error_helper.h	(working copy)
@@ -9,7 +9,6 @@
 
 #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"
@@ -71,33 +70,25 @@
 
  private:
   // NetErrorHelperCore::Delegate implementation:
-  virtual void GenerateLocalizedErrorPage(
-      const blink::WebURLError& error,
-      bool is_failed_post,
-      scoped_ptr<LocalizedError::ErrorPageParams> params,
-      std::string* html) const OVERRIDE;
+  virtual void GenerateLocalizedErrorPage(const blink::WebURLError& error,
+                                          bool is_failed_post,
+                                          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 FetchNavigationCorrections(
-      const GURL& navigation_correction_url,
-      const std::string& navigation_correction_request_body) OVERRIDE;
-  virtual void CancelFetchNavigationCorrections() OVERRIDE;
+  virtual void FetchErrorPage(const GURL& url) OVERRIDE;
+  virtual void CancelFetchErrorPage() OVERRIDE;
   virtual void ReloadPage() OVERRIDE;
 
   void OnNetErrorInfo(int status);
-  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 OnSetAltErrorPageURL(const GURL& alternate_error_page_url);
 
-  void OnNavigationCorrectionsFetched(const blink::WebURLResponse& response,
-                                      const std::string& data);
+  void OnAlternateErrorPageRetrieved(const blink::WebURLResponse& response,
+                                     const std::string& data);
 
-  scoped_ptr<content::ResourceFetcher> correction_fetcher_;
+  scoped_ptr<content::ResourceFetcher> alt_error_page_fetcher_;
 
   NetErrorHelperCore core_;