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

content/browser/frame_host/render_frame_message_filter.cc

 // Copyright 2013 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.
 
 #include "content/browser/frame_host/render_frame_message_filter.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
@@ skipping 474 matching lines @@
 void RenderFrameMessageFilter::GetPluginsCallback(
     IPC::Message* reply_msg,
     const url::Origin& main_frame_origin,
     const std::vector<WebPluginInfo>& all_plugins) {
   // Filter the plugin list.
   PluginServiceFilter* filter = PluginServiceImpl::GetInstance()->GetFilter();
   std::vector<WebPluginInfo> plugins;
 
   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.
   for (WebPluginInfo plugin : all_plugins) {
     // 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);
     }
   }
 
   FrameHostMsg_GetPlugins::WriteReplyParams(reply_msg, plugins);
   Send(reply_msg);
 }
 
 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(
     const base::FilePath& path,
     IPC::Message* reply_msg) {
   plugin_service_->OpenChannelToPpapiPlugin(
       render_process_id_,
       path,
       profile_data_directory_,
       new OpenChannelToPpapiPluginCallback(this, resource_context_, reply_msg));
@@ skipping 69 matching lines @@
   net::URLRequestContext* context =
       GetContentClient()->browser()->OverrideRequestContextForURL(
           url, resource_context_);
   if (!context)
     context = request_context_->GetURLRequestContext();
 
   return context;
 }
 
 }  // namespace content