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..0389ae857c2760a99152d71a1cdac584389d50b4 100644
--- a/content/browser/media/cdm/browser_cdm_manager.h
+++ b/content/browser/media/cdm/browser_cdm_manager.h
@@ -30,6 +30,8 @@ class BrowserCdm;
 
 namespace content {
 
+struct InitializeCdmParameters;
+
 // 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 +111,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);
+                       InitializeCdmParameters& parameters);

[ddorwin, 2015/05/13 06:03:20]

const

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

Done.

   void OnSetServerCertificate(int render_frame_id,
                               int cdm_id,
                               uint32_t promise_id,
@@ -138,7 +139,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_secure_codecs);
 
   // Removes all CDMs associated with |render_frame_id|.
   void RemoveAllCdmForFrame(int render_frame_id);