[Android WebView] Provide a minimal error description for nav errors

android_webview/renderer/aw_content_renderer_client.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 "android_webview/renderer/aw_content_renderer_client.h"
 
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/url_constants.h"
 #include "android_webview/renderer/aw_render_view_ext.h"
 #include "android_webview/renderer/view_renderer.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "content/public/renderer/render_thread.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 
 namespace android_webview {
 
 AwContentRendererClient::AwContentRendererClient() {
 }
@@ skipping 35 matching lines @@
     const WebKit::WebURLRequest& failed_request,
     const WebKit::WebURLError& error,
     std::string* error_html,
     string16* error_description) {
   if (error_html) {
     GURL error_url(failed_request.url());
     std::string err = UTF16ToUTF8(error.localizedDescription);
     std::string contents;
     if (err.empty()) {
       contents = AwResource::GetNoDomainPageContent();
+      if (error_description) {
+        *error_description =
+            string16(ASCIIToUTF16(net::ErrorToString(error.reason)));

[benm (inactive), 2013/06/04 10:24:50]

is the string16 ctor needed?

[mnaganov (inactive), 2013/06/04 10:43:04]

Actually not, removed.

+      }
     } else {
       contents = AwResource::GetLoadErrorPageContent();
       ReplaceSubstringsAfterOffset(&contents, 0, "%e", err);
+      if (error_description)
+        *error_description = error.localizedDescription;
     }
 
     ReplaceSubstringsAfterOffset(&contents, 0, "%s",
                                  error_url.possibly_invalid_spec());
     *error_html = contents;
   }
 }
 
 unsigned long long AwContentRendererClient::VisitedLinkHash(
     const char* canonical_url,
     size_t length) {
   return visited_link_slave_->ComputeURLFingerprint(canonical_url, length);
 }
 
 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
   return visited_link_slave_->IsVisited(link_hash);
 }
 
 void AwContentRendererClient::PrefetchHostName(const char* hostname,
                                                size_t length) {
   // TODO(boliu): Implement hostname prefetch for Android WebView.
   // Perhaps componentize chrome implementation or move to content/?
 }
 
 }  // namespace android_webview