Merge parts of 117417 from trunk.

content/browser/renderer_host/render_view_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 387 matching lines @@
   }
 
   const webkit_glue::WebAccessibility& accessibility_tree_for_testing() {
     return accessibility_tree_;
   }
 
   bool is_waiting_for_unload_ack_for_testing() {
     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.
   void SetAltErrorPageURL(const GURL& url);
 
   // Asks the renderer to exit fullscreen
   void ExitFullscreen();
 
   // Passes a list of Webkit preferences to the renderer.
   void UpdateWebkitPreferences(const WebPreferences& prefs);
@@ skipping 273 matching lines @@
   typedef std::map<int64, PowerSaveBlocker*> PowerSaveBlockerMap;
   PowerSaveBlockerMap power_save_blockers_;
 
   // A list of observers that filter messages.  Weak references.
   ObserverList<content::RenderViewHostObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_