Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

media/blink/webcontentdecryptionmodule_impl.h

 // Copyright 2013 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 MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 #define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "media/base/media_export.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 
 namespace blink {
 #if defined(ENABLE_PEPPER_CDMS)
 class WebLocalFrame;
 #endif
 class WebSecurityOrigin;
 }
 
 namespace media {
 
-struct CdmConfig;
 class CdmContext;
 class CdmFactory;
 class CdmSessionAdapter;
 class WebContentDecryptionModuleSessionImpl;
 
 class MEDIA_EXPORT WebContentDecryptionModuleImpl
     : public blink::WebContentDecryptionModule {
  public:
   static void Create(CdmFactory* cdm_factory,
                      const base::string16& key_system,
+                     bool allow_distinctive_identifier,
+                     bool allow_persistent_state,
                      const blink::WebSecurityOrigin& security_origin,
-                     const CdmConfig& cdm_config,
                      blink::WebContentDecryptionModuleResult result);
 
   virtual ~WebContentDecryptionModuleImpl();
 
   // blink::WebContentDecryptionModule implementation.
   virtual blink::WebContentDecryptionModuleSession* createSession();
 
   virtual void setServerCertificate(
       const uint8* server_certificate,
       size_t server_certificate_length,
@@ skipping 17 matching lines @@
 
 // Allow typecasting from blink type as this is the only implementation.
 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
     blink::WebContentDecryptionModule* cdm) {
   return static_cast<WebContentDecryptionModuleImpl*>(cdm);
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULE_IMPL_H_