[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..854833461b853e0162e68fa1c96bc7ace9e86c86 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -69,19 +69,21 @@ void AwContentRendererClient::GetNavigationErrorStrings(
     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 (error.localizedDescription.isEmpty())
+      *error_description = ASCIIToUTF16(net::ErrorToString(error.reason));
+    else
+      *error_description = error.localizedDescription;

[joth, 2013/06/05 16:10:37]

nit: need to use { } when there's an else.

Maybe easier:

*error_description = error.localizedDescription;
if (error_description->isEmpty()
  *error_description = ASCIIToUTF16(net::ErrorToString(error.reason));

+  }
 }
 
 unsigned long long AwContentRendererClient::VisitedLinkHash(