Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

media/cdm/default_cdm_factory.h

 // 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.
 
 #ifndef MEDIA_CDM_DEFAULT_CDM_FACTORY_H_
 #define MEDIA_CDM_DEFAULT_CDM_FACTORY_H_
 
 #include "base/macros.h"
 #include "media/base/cdm_factory.h"
 
 namespace media {
 
-struct CdmConfig;
-
 class DefaultCdmFactory : public CdmFactory {
  public:
   DefaultCdmFactory();
   ~DefaultCdmFactory() final;
 
   // CdmFactory implementation.
   void Create(const std::string& key_system,
+              bool allow_distinctive_identifier,
+              bool allow_persistent_state,
               const GURL& security_origin,
-              const CdmConfig& cdm_config,
               const SessionMessageCB& session_message_cb,
               const SessionClosedCB& session_closed_cb,
               const LegacySessionErrorCB& legacy_session_error_cb,
               const SessionKeysChangeCB& session_keys_change_cb,
               const SessionExpirationUpdateCB& session_expiration_update_cb,
               const CdmCreatedCB& cdm_created_cb) final;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultCdmFactory);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_DEFAULT_CDM_FACTORY_H_