Merge parts of 117417 from trunk.

content/browser/renderer_host/render_view_host.h

Index: content/browser/renderer_host/render_view_host.h
===================================================================
--- content/browser/renderer_host/render_view_host.h	(revision 128048)
+++ content/browser/renderer_host/render_view_host.h	(working copy)
@@ -405,10 +405,12 @@
     return is_waiting_for_unload_ack_;
   }
 
-  // Checks that the given renderer can request |url|, if not it sets it to an
-  // empty url.
+  // Checks that the given renderer can request |url|, if not it sets it to
+  // about:blank.
+  // empty_allowed must be set to false for navigations for security reasons.
   static void FilterURL(ChildProcessSecurityPolicy* policy,
                         int renderer_id,
+                        bool empty_allowed,
                         GURL* url);
 
   // Sets the alternate error page URL (link doctor) for the renderer process.