Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

media/blink/webcontentdecryptionmodule_impl.cc

 // 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.
 
 #include "webcontentdecryptionmodule_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/key_systems.h"
 #include "media/base/media_keys.h"
 #include "media/blink/cdm_result_promise.h"
 #include "media/blink/cdm_session_adapter.h"
 #include "media/blink/webcontentdecryptionmodulesession_impl.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "url/gurl.h"
 
 namespace media {
 
 void WebContentDecryptionModuleImpl::Create(
     media::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) {
   DCHECK(!security_origin.isNull());
   DCHECK(!key_system.empty());
 
   // TODO(ddorwin): Guard against this in supported types check and remove this.
   // Chromium only supports ASCII key systems.
   if (!base::IsStringASCII(key_system)) {
     NOTREACHED();
     result.completeWithError(
         blink::WebContentDecryptionModuleExceptionNotSupportedError, 0,
@@ skipping 20 matching lines @@
     return;
   }
 
   GURL security_origin_as_gurl(security_origin.toString());
 
   // CdmSessionAdapter::CreateCdm() will keep a reference to |adapter|. Then
   // if WebContentDecryptionModuleImpl is successfully created (returned in
   // |result|), it will keep a reference to |adapter|. Otherwise, |adapter| will
   // be destructed.
   scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter());
-  adapter->CreateCdm(cdm_factory, key_system_ascii, security_origin_as_gurl,
-                     cdm_config, result);
+  adapter->CreateCdm(cdm_factory, key_system_ascii,
+                     allow_distinctive_identifier, allow_persistent_state,
+                     security_origin_as_gurl, result);
 }
 
 WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(
     scoped_refptr<CdmSessionAdapter> adapter)
     : adapter_(adapter) {
 }
 
 WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() {
 }
 
@@ skipping 13 matching lines @@
                          server_certificate + server_certificate_length),
       scoped_ptr<SimpleCdmPromise>(
           new CdmResultPromise<>(result, std::string())));
 }
 
 CdmContext* WebContentDecryptionModuleImpl::GetCdmContext() {
   return adapter_->GetCdmContext();
 }
 
 }  // namespace media