Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

content/renderer/media/crypto/renderer_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_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 namespace blink {
 class WebFrame;
 }
 
+namespace media {
+struct CdmConfig;

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

ditto

[sandersd (OOO until July 31), 2015/05/14 00:06:57]

Done.

+}  // namespace media
+
 namespace content {
 
 class ProxyMediaKeys;
 
 // Class for managing all the CDM objects in the same RenderFrame.
 class RendererCdmManager : public RenderFrameObserver {
  public:
   // Constructs a RendererCdmManager object for the |render_frame|.
   explicit RendererCdmManager(RenderFrame* render_frame);
   ~RendererCdmManager() override;
 
   // RenderFrameObserver overrides.
   bool OnMessageReceived(const IPC::Message& msg) override;
 
   // Encrypted media related methods.
   void InitializeCdm(int cdm_id,
                      uint32_t promise_id,
                      ProxyMediaKeys* media_keys,
                      const std::string& key_system,
-                     const GURL& security_origin);
+                     const GURL& security_origin,
+                     bool use_secure_codecs);
   void SetServerCertificate(int cdm_id,
                             uint32_t promise_id,
                             const std::vector<uint8>& certificate);
   void CreateSessionAndGenerateRequest(
       int cdm_id,
       uint32_t promise_id,
       CdmHostMsg_CreateSession_InitDataType init_data_type,
       const std::vector<uint8>& init_data);
   void UpdateSession(int cdm_id,
                      uint32_t promise_id,
@@ skipping 51 matching lines @@
 
   // CDM ID to ProxyMediaKeys mapping.
   std::map<int, ProxyMediaKeys*> proxy_media_keys_map_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererCdmManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_RENDERER_CDM_MANAGER_H_