Check whether the Pepper CDM is available before adding the key system.

This adds a synchronous IPC from chrome_key_systems.cc to the browser process to
check with the PluginService.

BUG=224793
TEST=existing IsTypeSupported browser tests and new negative tests

Review URL: https://chromiumcodereview.appspot.com/23828007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223719 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 28 insertions, 0 deletions

diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
index f2260e4..9a15415 100644
--- a/chrome/browser/plugins/plugin_info_message_filter.cc
+++ b/chrome/browser/plugins/plugin_info_message_filter.cc
@@ -97,6 +97,9 @@ bool PluginInfoMessageFilter::OnMessageReceived(const IPC::Message& message,
   IPC_BEGIN_MESSAGE_MAP_EX(PluginInfoMessageFilter, message, *message_was_ok)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_GetPluginInfo,
                                     OnGetPluginInfo)
+    IPC_MESSAGE_HANDLER(
+        ChromeViewHostMsg_IsInternalPluginRegisteredForMimeType,
+        OnIsInternalPluginRegisteredForMimeType)
     IPC_MESSAGE_UNHANDLED(return false)
   IPC_END_MESSAGE_MAP()
   return true;
@@ -164,6 +167,25 @@ void PluginInfoMessageFilter::PluginsLoaded(
   Send(reply_msg);
 }
 
+void PluginInfoMessageFilter::OnIsInternalPluginRegisteredForMimeType(
+    const std::string& mime_type,
+    bool* is_registered) {
+   std::vector<WebPluginInfo> plugins;
+   PluginService::GetInstance()->GetInternalPlugins(&plugins);
+   for (size_t i = 0; i < plugins.size(); ++i) {
+     const std::vector<content::WebPluginMimeType>& mime_types =
+         plugins[i].mime_types;
+     for (size_t j = 0; j < mime_types.size(); ++j) {
+       if (mime_types[j].mime_type == mime_type) {
+         *is_registered = true;
+         return;
+       }
+     }
+   }
+
+   *is_registered = false;
+}
+
 void PluginInfoMessageFilter::Context::DecidePluginStatus(
     const GetPluginInfo_Params& params,
     const WebPluginInfo& plugin,
diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h
index d57427e..21cd02c 100644
--- a/chrome/browser/plugins/plugin_info_message_filter.h
+++ b/chrome/browser/plugins/plugin_info_message_filter.h
@@ -98,6 +98,12 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
                      IPC::Message* reply_msg,
                      const std::vector<content::WebPluginInfo>& plugins);
 
+  // Returns whether any internal plugin supporting |mime_type| is registered.
+  // Does not determine whether the plugin can actually be instantiated
+  // (e.g. whether it is allowed or has all its dependencies).
+  void OnIsInternalPluginRegisteredForMimeType(const std::string& mime_type,
+                                               bool* is_registered);
+
   Context context_;
 
   base::WeakPtrFactory<PluginInfoMessageFilter> weak_ptr_factory_;