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

content/browser/plugin_service_impl.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 "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 640 matching lines @@
   ComputePepperPluginList(&ppapi_plugins_);
   for (size_t i = 0; i < ppapi_plugins_.size(); ++i) {
     RegisterInternalPlugin(ppapi_plugins_[i].ToWebPluginInfo(), true);
   }
 }
 
 // There should generally be very few plugins so a brute-force search is fine.
 PepperPluginInfo* PluginServiceImpl::GetRegisteredPpapiPluginInfo(
     const base::FilePath& plugin_path) {
   PepperPluginInfo* info = NULL;
-  for (size_t i = 0; i < ppapi_plugins_.size(); i++) {
+  for (size_t i = 0; i < ppapi_plugins_.size(); ++i) {
     if (ppapi_plugins_[i].path == plugin_path) {
       info = &ppapi_plugins_[i];
       break;
     }
   }
   if (info)
     return info;
   // We did not find the plugin in our list. But wait! the plugin can also
   // be a latecomer, as it happens with pepper flash. This information
   // can be obtained from the PluginList singleton and we can use it to
   // construct it and add it to the list. This same deal needs to be done
   // in the renderer side in PepperPluginRegistry.
   WebPluginInfo webplugin_info;
   if (!GetPluginInfoByPath(plugin_path, &webplugin_info))
     return NULL;
   PepperPluginInfo new_pepper_info;
   if (!MakePepperPluginInfo(webplugin_info, &new_pepper_info))
     return NULL;
   ppapi_plugins_.push_back(new_pepper_info);
   return &ppapi_plugins_[ppapi_plugins_.size() - 1];
 }
 
+bool PluginServiceImpl::IsPepperPluginRegisteredForMimeType(
+    const std::string& mime_type) {
+  for (size_t i = 0; i < ppapi_plugins_.size(); ++i) {
+    const std::vector<WebPluginMimeType>& mime_types =
+        ppapi_plugins_[i].mime_types;
+    for (size_t j = 0; j < mime_types.size(); ++j) {
+      if (mime_types[j].mime_type == mime_type)
+        return true;
+    }
+  }
+
+  return false;
+}
+
 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
 // static
 void PluginServiceImpl::RegisterFilePathWatcher(FilePathWatcher* watcher,
                                                 const base::FilePath& path) {
   bool result = watcher->Watch(path, false,
                                base::Bind(&NotifyPluginDirChanged));
   DCHECK(result);
 }
 #endif
 
@@ skipping 141 matching lines @@
           window, kPluginVersionAtomProperty, plugin_version);
   return true;
 }
 
 bool PluginServiceImpl::IsPluginWindow(HWND window) {
   return gfx::GetClassName(window) == base::string16(kNativeWindowClassName);
 }
 #endif
 
 }  // namespace content