Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

content/common/media/cdm_messages.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.
 
 // IPC messages for content decryption module (CDM) implementation.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
+#ifndef CONTENT_COMMON_MEDIA_CDM_MESSAGES_H_
+#define CONTENT_COMMON_MEDIA_CDM_MESSAGES_H_
+
+namespace content {
+
+struct InitializeCdmParameters {

[nasko, 2015/05/14 21:53:18]

structs should be defined using
IPC_STRUCT_BEGIN/IPC_STRUCT_MEMBER/IPC_STRUCT_END if they are only used within
the message file. Using IPC_STRUCT_TRAITS* is applicable when the struct is
declared in an external header file, such as media::CdmKeyInformation for
example.

[sandersd (OOO until July 31), 2015/05/14 22:05:16]

Oh excellent, that looks much better.

+  std::string key_system;
+  GURL security_origin;
+  bool use_hw_secure_codecs = false;
+};
+
+}  // namespace content
+
+#endif  // CONTENT_COMMON_MEDIA_CDM_MESSAGES_H_
+
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START CdmMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(media::CdmKeyInformation::KeyStatus,
                           media::CdmKeyInformation::KEY_STATUS_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::Exception,
                           media::MediaKeys::EXCEPTION_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType,
                           media::MediaKeys::MESSAGE_TYPE_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(CdmHostMsg_CreateSession_InitDataType,
                           INIT_DATA_TYPE_MAX)
 
 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)
   IPC_STRUCT_TRAITS_MEMBER(key_id)
   IPC_STRUCT_TRAITS_MEMBER(status)
   IPC_STRUCT_TRAITS_MEMBER(system_code)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(content::InitializeCdmParameters)
+  IPC_STRUCT_TRAITS_MEMBER(key_system)
+  IPC_STRUCT_TRAITS_MEMBER(security_origin)
+  IPC_STRUCT_TRAITS_MEMBER(use_hw_secure_codecs)
+IPC_STRUCT_TRAITS_END()
+
 // Messages from render to browser.
 
-IPC_MESSAGE_CONTROL5(CdmHostMsg_InitializeCdm,
+IPC_MESSAGE_CONTROL4(CdmHostMsg_InitializeCdm,
                      int /* render_frame_id */,
                      int /* cdm_id */,
                      uint32_t /* promise_id */,
-                     std::string /* key_system */,
-                     GURL /* security_origin */)
+                     content::InitializeCdmParameters /* parameters */)
 
 IPC_MESSAGE_CONTROL4(CdmHostMsg_SetServerCertificate,
                      int /* render_frame_id */,
                      int /* cdm_id */,
                      uint32_t /* promise_id */,
                      std::vector<uint8_t> /* certificate */)
 
 IPC_MESSAGE_CONTROL5(CdmHostMsg_CreateSessionAndGenerateRequest,
                      int /* render_frame_id */,
                      int /* cdm_id */,
@@ skipping 57 matching lines @@
                     int /* cdm_id */,
                     uint32_t /* promise_id */,
                     std::string /* session_id */)
 
 IPC_MESSAGE_ROUTED5(CdmMsg_RejectPromise,
                     int /* cdm_id */,
                     uint32_t /* promise_id */,
                     media::MediaKeys::Exception /* exception */,
                     uint32_t /* system_code */,
                     std::string /* error_message */)