| Index: media/base/browser_cdm_factory.cc
|
| diff --git a/media/base/browser_cdm_factory.cc b/media/base/browser_cdm_factory.cc
|
| deleted file mode 100644
|
| index 69a6a02012f42b939ad1bd352dd8b0df31fcaac5..0000000000000000000000000000000000000000
|
| --- a/media/base/browser_cdm_factory.cc
|
| +++ /dev/null
|
| @@ -1,47 +0,0 @@
|
| -// 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.
|
| -
|
| -#include "media/base/browser_cdm_factory.h"
|
| -
|
| -#include "base/logging.h"
|
| -
|
| -#if defined(OS_ANDROID)
|
| -#include "media/base/android/browser_cdm_factory_android.h"
|
| -#endif
|
| -
|
| -namespace media {
|
| -
|
| -namespace {
|
| -BrowserCdmFactory* g_cdm_factory = NULL;
|
| -}
|
| -
|
| -void SetBrowserCdmFactory(BrowserCdmFactory* factory) {
|
| - DCHECK(!g_cdm_factory);
|
| - g_cdm_factory = factory;
|
| -}
|
| -
|
| -scoped_refptr<MediaKeys> CreateBrowserCdm(
|
| - const std::string& key_system,
|
| - bool use_hw_secure_codecs,
|
| - 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) {
|
| - if (!g_cdm_factory) {
|
| -#if defined(OS_ANDROID)
|
| - SetBrowserCdmFactory(new BrowserCdmFactoryAndroid());
|
| -#else
|
| - LOG(ERROR) << "Cannot create BrowserCdm: no BrowserCdmFactory available!";
|
| - return nullptr;
|
| -#endif
|
| - }
|
| -
|
| - return g_cdm_factory->CreateBrowserCdm(
|
| - key_system, use_hw_secure_codecs, session_message_cb, session_closed_cb,
|
| - legacy_session_error_cb, session_keys_change_cb,
|
| - session_expiration_update_cb);
|
| -}
|
| -
|
| -} // namespace media
|
|
|