Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Unified Diff: media/cdm/android_cdm_factory.cc

Issue 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment for DEPS change. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cdm/android_cdm_factory.h ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/android_cdm_factory.cc
diff --git a/media/cdm/android_cdm_factory.cc b/media/cdm/android_cdm_factory.cc
deleted file mode 100644
index bf0981481c8efb5a6a20facebef35a23c20f3c19..0000000000000000000000000000000000000000
--- a/media/cdm/android_cdm_factory.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015 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/cdm/android_cdm_factory.h"
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/location.h"
-#include "base/thread_task_runner_handle.h"
-#include "media/base/android/media_drm_bridge.h"
-#include "media/base/key_systems.h"
-#include "url/gurl.h"
-
-namespace media {
-
-AndroidCdmFactory::AndroidCdmFactory() {}
-
-AndroidCdmFactory::~AndroidCdmFactory() {}
-
-void AndroidCdmFactory::Create(
- const std::string& key_system,
- 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) {
- if (!security_origin.is_valid()) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(cdm_created_cb, nullptr, "Invalid origin."));
- return;
- }
-
- if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
- NOTREACHED() << "Key system not supported unexpectedly: " << key_system;
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(cdm_created_cb, nullptr,
- "Key system not supported unexpectedly."));
- return;
- }
-
- // TODO(xhwang): Currently MediaDrmBridge can only be created on the Browser
- // UI thread. Create it here after that is fixed. See http://crbug.com/546108
- NOTIMPLEMENTED();
-
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(cdm_created_cb, nullptr, "MediaDrmBridge cannot be created."));
-}
-
-} // namespace media
« no previous file with comments | « media/cdm/android_cdm_factory.h ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698