Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / android_webview / renderer / aw_content_renderer_client.cc

diff --git a/src/android_webview/renderer/aw_content_renderer_client.cc b/src/android_webview/renderer/aw_content_renderer_client.cc
index 224e1ed..7001aff 100644 (file)
--- a/src/android_webview/renderer/aw_content_renderer_client.cc
+++ b/src/android_webview/renderer/aw_content_renderer_client.cc
@@ -22,6 +22,7 @@
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
+#include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
@@ -139,7 +140,7 @@ void AwContentRendererClient::RenderViewCreated(
   // autofill agent to store a weakptr).
   autofill::PasswordAutofillAgent* password_autofill_agent =
       new autofill::PasswordAutofillAgent(render_view);
-  new autofill::AutofillAgent(render_view, password_autofill_agent);
+  new autofill::AutofillAgent(render_view, password_autofill_agent, NULL);
 }
 
 std::string AwContentRendererClient::GetDefaultEncoding() {
@@ -170,7 +171,7 @@ void AwContentRendererClient::GetNavigationErrorStrings(
     }
 
     ReplaceSubstringsAfterOffset(&contents, 0, "%s",
-                                 error_url.possibly_invalid_spec());
+        net::EscapeForHTML(error_url.possibly_invalid_spec()));
     *error_html = contents;
   }
   if (error_description) {