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

chrome/browser/plugins/plugin_info_message_filter.cc

 // 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.
 
 #include "chrome/browser/plugins/plugin_info_message_filter.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 24 matching lines @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/prefs/pref_service.h"
 #include "components/rappor/rappor_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/plugin_service_filter.h"
 #include "content/public/common/content_constants.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(ENABLE_EXTENSIONS)
 #include "components/guest_view/browser/guest_view_base.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/webview_info.h"
 #endif
@@ skipping 27 matching lines @@
                             status, PLUGIN_AVAILABILITY_STATUS_MAX);
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 }
 
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 // Report usage metrics for Silverlight and Flash plugin instantiations to the
 // RAPPOR service.
 void ReportMetrics(const std::string& mime_type,
                    const GURL& url,
-                   const GURL& origin_url) {
+                   const url::Origin& top_origin) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (chrome::IsIncognitoSessionActive())
     return;
   rappor::RapporService* rappor_service = g_browser_process->rappor_service();
   if (!rappor_service)
     return;
+  if (top_origin.unique())
+    return;
 
   if (mime_type == content::kFlashPluginSwfMimeType ||
       mime_type == content::kFlashPluginSplMimeType) {
     rappor_service->RecordSample(
         "Plugins.FlashOriginUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
         net::registry_controlled_domains::GetDomainAndRegistry(
-            origin_url,
+            GURL(top_origin.Serialize()),
             net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
     rappor_service->RecordSample(
         "Plugins.FlashUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
         net::registry_controlled_domains::GetDomainAndRegistry(
             url,
             net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
   }
 }
 
 #if defined(ENABLE_EXTENSIONS)
@@ skipping 83 matching lines @@
 
   // Destroy on the UI thread because we contain a |PrefMember|.
   content::BrowserThread::DeleteOnUIThread::Destruct(this);
 }
 
 PluginInfoMessageFilter::~PluginInfoMessageFilter() {}
 
 struct PluginInfoMessageFilter::GetPluginInfo_Params {
   int render_frame_id;
   GURL url;
-  GURL top_origin_url;
+  url::Origin top_origin_url;

[nasko, 2016/09/30 20:38:48]

This variable is no longer an URL.

[tommycli, 2016/09/30 21:20:41]

Done.

   std::string mime_type;
 };
 
-void PluginInfoMessageFilter::OnGetPluginInfo(
-    int render_frame_id,
-    const GURL& url,
-    const GURL& top_origin_url,
-    const std::string& mime_type,
-    IPC::Message* reply_msg) {
+void PluginInfoMessageFilter::OnGetPluginInfo(int render_frame_id,
+                                              const GURL& url,
+                                              const url::Origin& top_origin_url,

[nasko, 2016/09/30 20:38:48]

Not an URL

[tommycli, 2016/09/30 21:20:41]

Done.

+                                              const std::string& mime_type,
+                                              IPC::Message* reply_msg) {
   GetPluginInfo_Params params = {
     render_frame_id,
     url,
     top_origin_url,
     mime_type
   };
   PluginService::GetInstance()->GetPlugins(
       base::Bind(&PluginInfoMessageFilter::PluginsLoaded,
                  weak_ptr_factory_.GetWeakPtr(),
                  params, reply_msg));
@@ skipping 160 matching lines @@
     if (extensions::WebViewRendererState::GetInstance()->IsGuest(
             render_process_id_))
       *status = ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized;
   }
 #endif
 }
 
 bool PluginInfoMessageFilter::Context::FindEnabledPlugin(
     int render_frame_id,
     const GURL& url,
-    const GURL& top_origin_url,
+    const url::Origin& top_origin_url,
     const std::string& mime_type,
     ChromeViewHostMsg_GetPluginInfo_Status* status,
     WebPluginInfo* plugin,
     std::string* actual_mime_type,
     std::unique_ptr<PluginMetadata>* plugin_metadata) const {
   *status = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
 
   bool allow_wildcard = true;
   std::vector<WebPluginInfo> matching_plugins;
   std::vector<std::string> mime_types;
@@ skipping 99 matching lines @@
       status == ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent) {
     ChromePluginServiceFilter::GetInstance()->AuthorizePlugin(
         render_process_id_, path);
   }
 }
 
 bool PluginInfoMessageFilter::Context::IsPluginEnabled(
     const content::WebPluginInfo& plugin) const {
   return plugin_prefs_->IsPluginEnabled(plugin);
 }