Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

content/renderer/media/crypto/renderer_cdm_manager.cc

 // 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.
 
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 
 #include "base/stl_util.h"
 #include "content/common/media/cdm_messages.h"
 #include "content/renderer/media/crypto/proxy_media_keys.h"
 #include "media/base/cdm_context.h"
@@ skipping 34 matching lines @@
     IPC_MESSAGE_HANDLER(CdmMsg_RejectPromise, OnPromiseRejected)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RendererCdmManager::InitializeCdm(int cdm_id,
                                        uint32_t promise_id,
                                        ProxyMediaKeys* media_keys,
                                        const std::string& key_system,
-                                       const GURL& security_origin,
-                                       bool use_hw_secure_codecs) {
+                                       const GURL& security_origin) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
-  CdmHostMsg_InitializeCdm_Params params;
-  params.key_system = key_system;
-  params.security_origin = security_origin;
-  params.use_hw_secure_codecs = use_hw_secure_codecs;
-  Send(new CdmHostMsg_InitializeCdm(routing_id(), cdm_id, promise_id, params));
+  Send(new CdmHostMsg_InitializeCdm(routing_id(), cdm_id, promise_id,
+                                    key_system, security_origin));
 }
 
 void RendererCdmManager::SetServerCertificate(
     int cdm_id,
     uint32_t promise_id,
     const std::vector<uint8_t>& certificate) {
   DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
   Send(new CdmHostMsg_SetServerCertificate(routing_id(), cdm_id, promise_id,
                                            certificate));
 }
@@ skipping 140 matching lines @@
   proxy_media_keys_map_.erase(cdm_id);
 }
 
 ProxyMediaKeys* RendererCdmManager::GetMediaKeys(int cdm_id) {
   std::map<int, ProxyMediaKeys*>::iterator iter =
       proxy_media_keys_map_.find(cdm_id);
   return (iter != proxy_media_keys_map_.end()) ? iter->second : NULL;
 }
 
 }  // namespace content