[HBD] Blanket BLOCK on all non-HTTP(s) and non-FILE URLs for Flash.

content/browser/frame_host/render_frame_message_filter.cc

Index: content/browser/frame_host/render_frame_message_filter.cc
diff --git a/content/browser/frame_host/render_frame_message_filter.cc b/content/browser/frame_host/render_frame_message_filter.cc
index e5e7bb9b322ee5076a97bc241c7f4ea14e158c7e..65dfd77e53fe96856e7ec32afb677749c05a60a5 100644
--- a/content/browser/frame_host/render_frame_message_filter.cc
+++ b/content/browser/frame_host/render_frame_message_filter.cc
@@ -492,7 +492,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
 
   int child_process_id = -1;
   int routing_id = MSG_ROUTING_NONE;
-  GURL policy_url =
+  GURL plugin_content_url =

[nasko, 2016/10/05 21:14:31]

This is still an origin, even if it is stored as a GURL.

[tommycli, 2016/10/05 21:41:23]

Done.

       main_frame_origin.unique() ? GURL() : GURL(main_frame_origin.Serialize());

[nasko, 2016/10/05 21:14:31]

Let's change that to be main_frame_origin.GetURL(), since this new method avoids
serializing and parsing it again.

[tommycli, 2016/10/05 21:41:22]

Done.

   // In this loop, copy the WebPluginInfo (and do not use a reference) because
   // the filter might mutate it.
@@ -500,8 +500,8 @@ void RenderFrameMessageFilter::GetPluginsCallback(
     // TODO(crbug.com/621724): Pass an url::Origin instead of a GURL.
     if (!filter ||
         filter->IsPluginAvailable(child_process_id, routing_id,
-                                  resource_context_, policy_url, policy_url,
-                                  &plugin)) {
+                                  resource_context_, plugin_content_url,
+                                  main_frame_origin, &plugin)) {
       plugins.push_back(plugin);
     }
   }
@@ -513,16 +513,16 @@ void RenderFrameMessageFilter::GetPluginsCallback(
 void RenderFrameMessageFilter::OnGetPluginInfo(
     int render_frame_id,
     const GURL& url,
-    const GURL& page_url,
+    const url::Origin& main_frame_origin,
     const std::string& mime_type,
     bool* found,
     WebPluginInfo* info,
     std::string* actual_mime_type) {
   bool allow_wildcard = true;
   *found = plugin_service_->GetPluginInfo(
-      render_process_id_, render_frame_id, resource_context_,
-      url, page_url, mime_type, allow_wildcard,
-      nullptr, info, actual_mime_type);
+      render_process_id_, render_frame_id, resource_context_, url,
+      main_frame_origin, mime_type, allow_wildcard, nullptr, info,
+      actual_mime_type);
 }
 
 void RenderFrameMessageFilter::OnOpenChannelToPepperPlugin(