[Android WebView] Fix error description setting for provisional load

android_webview/renderer/aw_content_renderer_client.cc

Index: android_webview/renderer/aw_content_renderer_client.cc
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index 990e9eaca9cd9db01b5b8380787db2c15fa961c5..2286609d68b19f30c26ec8c3e077293af96b545b 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -63,25 +63,27 @@ void AwContentRendererClient::GetNavigationErrorStrings(
     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(