Revert 255617, due to it not tracking use of the link doctor page properly.

chrome/renderer/net/net_error_helper.cc

 // 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.
 
 #include "chrome/renderer/net/net_error_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
-#include "base/i18n/rtl.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/localized_error.h"
 #include "chrome/common/net/net_error_info.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/net/error_cache_load.h"
 #include "content/public/common/content_client.h"
@@ skipping 21 matching lines @@
 using base::JSONWriter;
 using chrome_common_net::DnsProbeStatus;
 using chrome_common_net::DnsProbeStatusToString;
 using content::RenderFrame;
 using content::RenderFrameObserver;
 using content::RenderThread;
 using content::kUnreachableWebDataURL;
 
 namespace {
 
-// Number of seconds to wait for the navigation correction service to return
-// suggestions.  If it takes too long, just use the local error page.
-static const int kNavigationCorrectionFetchTimeoutSec = 3;
+// Number of seconds to wait for the alternate error page server.  If it takes
+// too long, just use the local error page.
+static const int kAlterErrorPageFetchTimeoutSec = 3000;
 
 NetErrorHelperCore::PageType GetLoadingPageType(const blink::WebFrame* frame) {
   GURL url = frame->provisionalDataSource()->request().url();
   if (!url.is_valid() || url.spec() != kUnreachableWebDataURL)
     return NetErrorHelperCore::NON_ERROR_PAGE;
   return NetErrorHelperCore::ERROR_PAGE;
 }
 
 NetErrorHelperCore::FrameType GetFrameType(const blink::WebFrame* frame) {
   if (!frame->parent())
     return NetErrorHelperCore::MAIN_FRAME;
   return NetErrorHelperCore::SUB_FRAME;
 }
 
-// Copied from localized_error.cc.
-// TODO(mmenke):  Share code?
-bool LocaleIsRTL() {
-#if defined(TOOLKIT_GTK)
-  // base::i18n::IsRTL() uses the GTK text direction, which doesn't work within
-  // the renderer sandbox.
-  return base::i18n::ICUIsRTL();
-#else
-  return base::i18n::IsRTL();
-#endif
-}
-
 }  // namespace
 
 NetErrorHelper::NetErrorHelper(RenderFrame* render_view)
     : RenderFrameObserver(render_view),
       content::RenderFrameObserverTracker<NetErrorHelper>(render_view),
       core_(this) {
   RenderThread::Get()->AddObserver(this);
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   bool auto_reload_enabled =
       command_line->HasSwitch(switches::kEnableOfflineAutoReload);
@@ skipping 21 matching lines @@
 
 void NetErrorHelper::OnStop() {
   core_.OnStop();
 }
 
 bool NetErrorHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
 
   IPC_BEGIN_MESSAGE_MAP(NetErrorHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_NetErrorInfo, OnNetErrorInfo)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetNavigationCorrectionInfo,
-                        OnSetNavigationCorrectionInfo);
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetAltErrorPageURL, OnSetAltErrorPageURL);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void NetErrorHelper::NetworkStateChanged(bool enabled) {
   core_.NetworkStateChanged(enabled);
 }
 
 void NetErrorHelper::GetErrorHTML(
     blink::WebFrame* frame,
     const blink::WebURLError& error,
     bool is_failed_post,
     std::string* error_html) {
   core_.GetErrorHTML(GetFrameType(frame), error, is_failed_post, error_html);
 }
 
 bool NetErrorHelper::ShouldSuppressErrorPage(blink::WebFrame* frame,
                                              const GURL& url) {
   return core_.ShouldSuppressErrorPage(GetFrameType(frame), url);
 }
 
-void NetErrorHelper::GenerateLocalizedErrorPage(
-    const blink::WebURLError& error,
-    bool is_failed_post,
-    scoped_ptr<LocalizedError::ErrorPageParams> params,
-    std::string* error_html) const {
+void NetErrorHelper::GenerateLocalizedErrorPage(const blink::WebURLError& error,
+                                                bool is_failed_post,
+                                                std::string* error_html) const {
   error_html->clear();
 
   int resource_id = IDR_NET_ERROR_HTML;
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
   if (template_html.empty()) {
     NOTREACHED() << "unable to load template.";
   } else {
     base::DictionaryValue error_strings;
     LocalizedError::GetStrings(error.reason, error.domain.utf8(),
                                error.unreachableURL, is_failed_post,
                                error.staleCopyInCache,
                                RenderThread::Get()->GetLocale(),
                                render_frame()->GetRenderView()->
                                    GetAcceptLanguages(),
-                               params.Pass(), &error_strings);
+                               &error_strings);
     // "t" is the id of the template's root node.
     *error_html = webui::GetTemplatesHtml(template_html, &error_strings, "t");
   }
 }
 
 void NetErrorHelper::LoadErrorPageInMainFrame(const std::string& html,
                                               const GURL& failed_url) {
   blink::WebView* web_view = render_frame()->GetRenderView()->GetWebView();
   if (!web_view)
     return;
   blink::WebFrame* frame = web_view->mainFrame();
   frame->loadHTMLString(html, GURL(kUnreachableWebDataURL), failed_url, true);
 }
 
 void NetErrorHelper::EnableStaleLoadBindings(const GURL& page_url) {
   ErrorCacheLoad::Install(render_frame(), page_url);
 }
 
 void NetErrorHelper::UpdateErrorPage(const blink::WebURLError& error,
                                      bool is_failed_post) {
   base::DictionaryValue error_strings;
   LocalizedError::GetStrings(error.reason,
                              error.domain.utf8(),
                              error.unreachableURL,
                              is_failed_post,
                              error.staleCopyInCache,
                              RenderThread::Get()->GetLocale(),
                              render_frame()->GetRenderView()->
                                  GetAcceptLanguages(),
-                             scoped_ptr<LocalizedError::ErrorPageParams>(),
                              &error_strings);
 
   std::string json;
   JSONWriter::Write(&error_strings, &json);
 
   std::string js = "if (window.updateForDnsProbe) "
                    "updateForDnsProbe(" + json + ");";
   base::string16 js16;
   if (!base::UTF8ToUTF16(js.c_str(), js.length(), &js16)) {
     NOTREACHED();
     return;
   }
 
   render_frame()->ExecuteJavaScript(js16);
 }
 
-void NetErrorHelper::FetchNavigationCorrections(
-    const GURL& navigation_correction_url,
-    const std::string& navigation_correction_request_body) {
-  DCHECK(!correction_fetcher_.get());
+void NetErrorHelper::FetchErrorPage(const GURL& url) {
+  DCHECK(!alt_error_page_fetcher_.get());
 
   blink::WebView* web_view = render_frame()->GetRenderView()->GetWebView();
   if (!web_view)
     return;
   blink::WebFrame* frame = web_view->mainFrame();
 
-  correction_fetcher_.reset(
-      content::ResourceFetcher::Create(navigation_correction_url));
-  correction_fetcher_->SetMethod("POST");
-  correction_fetcher_->SetBody(navigation_correction_request_body);
-  correction_fetcher_->SetHeader("Content-Type", "application/json");
-  correction_fetcher_->Start(
+  alt_error_page_fetcher_.reset(content::ResourceFetcher::Create(url));
+
+  alt_error_page_fetcher_->Start(
       frame, blink::WebURLRequest::TargetIsMainFrame,
-      base::Bind(&NetErrorHelper::OnNavigationCorrectionsFetched,
+      base::Bind(&NetErrorHelper::OnAlternateErrorPageRetrieved,
                      base::Unretained(this)));
 
-  correction_fetcher_->SetTimeout(
-      base::TimeDelta::FromSeconds(kNavigationCorrectionFetchTimeoutSec));
+  alt_error_page_fetcher_->SetTimeout(
+      base::TimeDelta::FromSeconds(kAlterErrorPageFetchTimeoutSec));
 }
 
-void NetErrorHelper::CancelFetchNavigationCorrections() {
-  correction_fetcher_.reset();
+void NetErrorHelper::CancelFetchErrorPage() {
+  alt_error_page_fetcher_.reset();
 }
 
 void NetErrorHelper::ReloadPage() {
   render_frame()->GetWebFrame()->reload(false);
 }
 
 void NetErrorHelper::OnNetErrorInfo(int status_num) {
   DCHECK(status_num >= 0 && status_num < chrome_common_net::DNS_PROBE_MAX);
 
   DVLOG(1) << "Received status " << DnsProbeStatusToString(status_num);
 
   core_.OnNetErrorInfo(static_cast<DnsProbeStatus>(status_num));
 }
 
-void NetErrorHelper::OnSetNavigationCorrectionInfo(
-    const GURL& navigation_correction_url,
-    const std::string& language,
-    const std::string& country_code,
-    const std::string& api_key,
-    const GURL& search_url) {
-  core_.OnSetNavigationCorrectionInfo(navigation_correction_url, language,
-                                      country_code, api_key, search_url);
+void NetErrorHelper::OnSetAltErrorPageURL(const GURL& alt_error_page_url) {
+  core_.set_alt_error_page_url(alt_error_page_url);
 }
 
-void NetErrorHelper::OnNavigationCorrectionsFetched(
+void NetErrorHelper::OnAlternateErrorPageRetrieved(
     const blink::WebURLResponse& response,
     const std::string& data) {
   // The fetcher may only be deleted after |data| is passed to |core_|.  Move
   // it to a temporary to prevent any potential re-entrancy issues.
   scoped_ptr<content::ResourceFetcher> fetcher(
-      correction_fetcher_.release());
+      alt_error_page_fetcher_.release());
   if (!response.isNull() && response.httpStatusCode() == 200) {
-    core_.OnNavigationCorrectionsFetched(
-        data, render_frame()->GetRenderView()->GetAcceptLanguages(),
-        LocaleIsRTL());
+    core_.OnAlternateErrorPageFetched(data);
   } else {
-    core_.OnNavigationCorrectionsFetched(
-        "", render_frame()->GetRenderView()->GetAcceptLanguages(),
-        LocaleIsRTL());
+    core_.OnAlternateErrorPageFetched("");
   }
 }