Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

content/browser/media/cdm/browser_cdm_manager.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #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"
 #include "ipc/ipc_message.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 namespace media {
 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.
 class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {
  public:
   // Returns the BrowserCdmManager associated with the |render_process_id|.
   // Returns NULL if no BrowserCdmManager is associated.
   static BrowserCdmManager* FromProcess(int render_process_id);
 
   // Constructs the BrowserCdmManager for |render_process_id| which runs on
@@ skipping 59 matching lines @@
                            media::CdmKeysInfo keys_info);
   void OnSessionExpirationUpdate(int render_frame_id,
                                  int cdm_id,
                                  const std::string& session_id,
                                  const base::Time& new_expiry_time);
 
   // Message handlers.
   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,
                               const std::vector<uint8_t>& certificate);
   void OnCreateSessionAndGenerateRequest(
       int render_frame_id,
       int cdm_id,
       uint32_t promise_id,
       CdmHostMsg_CreateSession_InitDataType init_data_type,
       const std::vector<uint8>& init_data);
   void OnUpdateSession(int render_frame_id,
                        int cdm_id,
                        uint32_t promise_id,
                        const std::string& session_id,
                        const std::vector<uint8>& response);
   void OnCloseSession(int render_frame_id,
                       int cdm_id,
                       uint32_t promise_id,
                       const std::string& session_id);
   void OnDestroyCdm(int render_frame_id, int cdm_id);
 
   // Adds a new CDM identified by |cdm_id| for the given |key_system| and
   // |security_origin|.
   void AddCdm(int render_frame_id,
               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);
 
   // Removes the CDM with the specified id.
   void RemoveCdm(uint64 id);
 
   using PermissionStatusCB = base::Callback<void(bool)>;
 
   // Checks protected media identifier permission for the given
@@ skipping 36 matching lines @@
   std::map<uint64, GURL> cdm_security_origin_map_;
 
   base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_