Add another didRunInsecureContent method.

In order to better log mixed-scripting issues I want to get the URL into
Chrome land. This involves a WebKit change ([1]) but, by making this
change first, we can decouple of the two changes.

[1] https://bugs.webkit.org/show_bug.cgi?id=52384

BUG=none
TEST=compile

http://codereview.chromium.org/6272003/

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71881 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 2 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index fe84d68..1633aec 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3682,11 +3682,20 @@ void RenderView::didDisplayInsecureContent(WebFrame* frame) {
   Send(new ViewHostMsg_DidDisplayInsecureContent(routing_id_));
 }
 
+// We have two didRunInsecureContent's with the same name. That's because
+// we're in the process of adding an argument and one of them will be correct.
+// Once the WebKit change is in, the first should be removed.
 void RenderView::didRunInsecureContent(
     WebFrame* frame, const WebSecurityOrigin& origin) {
+  didRunInsecureContent(frame, origin, GURL());
+}
+
+void RenderView::didRunInsecureContent(
+    WebFrame* frame, const WebSecurityOrigin& origin, const WebURL& target) {
   Send(new ViewHostMsg_DidRunInsecureContent(
       routing_id_,
-      origin.toString().utf8()));
+      origin.toString().utf8(),
+      target));
 }
 
 bool RenderView::allowScript(WebFrame* frame, bool enabled_per_settings) {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index dfbcf7d..1b74d68 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -576,9 +576,19 @@ class RenderView : public RenderWidget,
       const WebKit::WebURLRequest& request,
       const WebKit::WebURLResponse&);
   virtual void didDisplayInsecureContent(WebKit::WebFrame* frame);
+
+  // We have two didRunInsecureContent's with the same name. That's because
+  // we're in the process of adding an argument and one of them will be correct.
+  // Once the WebKit change is in, the first should be removed the the second
+  // should be tagged with OVERRIDE.
+  virtual void didRunInsecureContent(
+      WebKit::WebFrame* frame,
+      const WebKit::WebSecurityOrigin& origin);
   virtual void didRunInsecureContent(
       WebKit::WebFrame* frame,
-      const WebKit::WebSecurityOrigin& origin) OVERRIDE;
+      const WebKit::WebSecurityOrigin& origin,
+      const WebKit::WebURL& target);
+
   virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings);
   virtual bool allowDatabase(WebKit::WebFrame* frame,
                              const WebKit::WebString& name,