Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

content/browser/media/cdm/browser_cdm_manager.h

Index: content/browser/media/cdm/browser_cdm_manager.h
diff --git a/content/browser/media/cdm/browser_cdm_manager.h b/content/browser/media/cdm/browser_cdm_manager.h
index 6e3c91318d6a93cb5019136f1ece123e8e02be8f..e58d45930baa011bc1ddfaf5c1d564b1a223f6c9 100644
--- a/content/browser/media/cdm/browser_cdm_manager.h
+++ b/content/browser/media/cdm/browser_cdm_manager.h
@@ -15,6 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
+#include "content/common/media/cdm_messages.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/common/permission_status.mojom.h"
@@ -30,6 +31,8 @@ class BrowserCdm;
 
 namespace content {
 
+struct InitializeCdmParameters;

[dcheng, 2015/05/15 15:31:32]

Is this leftover from an earlier patch?

[sandersd (OOO until July 31), 2015/05/15 17:52:18]

Oops.

https://codereview.chromium.org/1136663006

+
 // This class manages all CDM objects. It receives control operations from the
 // the render process, and forwards them to corresponding CDM object. Callbacks
 // from CDM objects are converted to IPCs and then sent to the render process.
@@ -109,8 +112,7 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {
   void OnInitializeCdm(int render_frame_id,
                        int cdm_id,
                        uint32_t promise_id,
-                       const std::string& key_system,
-                       const GURL& frame_url);
+                       const CdmHostMsg_InitializeCdm_Params& params);
   void OnSetServerCertificate(int render_frame_id,
                               int cdm_id,
                               uint32_t promise_id,
@@ -138,7 +140,8 @@ class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {
               int cdm_id,
               uint32_t promise_id,
               const std::string& key_system,
-              const GURL& security_origin);
+              const GURL& security_origin,
+              bool use_hw_secure_codecs);
 
   // Removes all CDMs associated with |render_frame_id|.
   void RemoveAllCdmForFrame(int render_frame_id);