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

Unified Diff: media/mojo/services/android_mojo_media_client.cc

Issue 1649933002: [Chromecast] Hook up mojo media pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed chrome build with enable_mojo_media Created 4 years, 11 months 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
Index: media/mojo/services/android_mojo_media_client.cc
diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc
deleted file mode 100644
index dd9a745502d3e25b272a3aff47d4c9b7fc39de1c..0000000000000000000000000000000000000000
--- a/media/mojo/services/android_mojo_media_client.cc
+++ /dev/null
@@ -1,47 +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/mojo/services/mojo_media_client.h"
-
-#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/base/android/android_cdm_factory.h"
-#include "media/base/bind_to_current_loop.h"
-#include "media/base/media.h"
-#include "media/mojo/interfaces/provision_fetcher.mojom.h"
-#include "media/mojo/services/mojo_provision_fetcher.h"
-#include "mojo/shell/public/cpp/connect.h"
-
-namespace media {
-
-namespace {
-scoped_ptr<ProvisionFetcher> CreateProvisionFetcher(
- mojo::ServiceProvider* service_provider) {
- interfaces::ProvisionFetcherPtr provision_fetcher_ptr;
- mojo::ConnectToService(service_provider, &provision_fetcher_ptr);
- return make_scoped_ptr(
- new MojoProvisionFetcher(std::move(provision_fetcher_ptr)));
-}
-
-class AndroidMojoMediaClient : public MojoMediaClient {
- public:
- AndroidMojoMediaClient() {}
-
- // MojoMediaClient overrides.
- scoped_ptr<CdmFactory> CreateCdmFactory(
- mojo::ServiceProvider* service_provider) override {
- return make_scoped_ptr(new AndroidCdmFactory(
- base::Bind(&CreateProvisionFetcher, service_provider)));
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AndroidMojoMediaClient);
-};
-} // namespace (anonymous)
-
-scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
- return make_scoped_ptr(new AndroidMojoMediaClient());
-}
-
-} // namespace media

Powered by Google App Engine
This is Rietveld 408576698