Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

media/blink/webencryptedmediaclient_impl.h

Index: media/blink/webencryptedmediaclient_impl.h
diff --git a/media/blink/webencryptedmediaclient_impl.h b/media/blink/webencryptedmediaclient_impl.h
index d34f27252ec052004b379582eac972bca4fc09af..ba8f9bdcad388739bf2844ee2cf943c658313598 100644
--- a/media/blink/webencryptedmediaclient_impl.h
+++ b/media/blink/webencryptedmediaclient_impl.h
@@ -25,7 +25,6 @@
 
 namespace media {
 
-struct CdmConfig;
 class CdmFactory;
 class KeySystems;
 class MediaPermission;
@@ -46,8 +45,9 @@
   // Create the CDM for |key_system| and |security_origin|. The caller owns
   // the created cdm (passed back using |result|).
   void CreateCdm(const blink::WebString& key_system,
+                 bool allow_distinctive_identifier,
+                 bool allow_persistent_state,
                  const blink::WebSecurityOrigin& security_origin,
-                 const CdmConfig& cdm_config,
                  blink::WebContentDecryptionModuleResult result);
 
  private:
@@ -62,7 +62,7 @@
   void OnRequestSucceeded(
       blink::WebEncryptedMediaRequest request,
       const blink::WebMediaKeySystemConfiguration& accumulated_configuration,
-      const CdmConfig& cdm_config);
+      bool are_secure_codecs_required);
 
   // Complete a requestMediaKeySystemAccess() request with an error message.
   void OnRequestNotSupported(blink::WebEncryptedMediaRequest request,