[Android WebView] Fix error description setting for provisional load

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"
@@ skipping 45 matching lines @@
                           std::string* error_domain) {
   return http_status_code >= 400;
 }
 
 void AwContentRendererClient::GetNavigationErrorStrings(
     WebKit::WebFrame* /* frame */,
     const WebKit::WebURLRequest& failed_request,
     const WebKit::WebURLError& error,
     std::string* error_html,
     string16* error_description) {
+  std::string err = UTF16ToUTF8(error.localizedDescription);

[benm (inactive), 2013/06/05 09:35:08]

I think you could leave this inside the error_html block and use the
error.localizedDescription directly in the block you added below?

In fact I think we only need to create the std::string variable in the case that
the string16 is non-empty, ie. we are replacing the %e in the error page
content.

[mnaganov (inactive), 2013/06/05 09:46:21]

Sorry, I've made this change in a very mechanical manner. Surely we don't
actually need 'err' for setting error_description. Fixed.

   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 = ASCIIToUTF16(net::ErrorToString(error.reason));
     } 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;
   }
+  if (error_description) {
+    if (err.empty())
+      *error_description = ASCIIToUTF16(net::ErrorToString(error.reason));
+    else
+      *error_description = error.localizedDescription;
+  }
 }
 
 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