Revert of 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 e58d45930baa011bc1ddfaf5c1d564b1a223f6c9..6e3c91318d6a93cb5019136f1ece123e8e02be8f 100644
--- a/content/browser/media/cdm/browser_cdm_manager.h
+++ b/content/browser/media/cdm/browser_cdm_manager.h
@@ -15,7 +15,6 @@
 #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"
@@ -30,8 +29,6 @@
 }
 
 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
@@ -112,7 +109,8 @@
   void OnInitializeCdm(int render_frame_id,
                        int cdm_id,
                        uint32_t promise_id,
-                       const CdmHostMsg_InitializeCdm_Params& params);
+                       const std::string& key_system,
+                       const GURL& frame_url);
   void OnSetServerCertificate(int render_frame_id,
                               int cdm_id,
                               uint32_t promise_id,
@@ -140,8 +138,7 @@
               int cdm_id,
               uint32_t promise_id,
               const std::string& key_system,
-              const GURL& security_origin,
-              bool use_hw_secure_codecs);
+              const GURL& security_origin);
 
   // Removes all CDMs associated with |render_frame_id|.
   void RemoveAllCdmForFrame(int render_frame_id);