Reland "media: Refactor MojoMediaClient" with fix.

media/mojo/services/android_mojo_media_client.cc

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
index efd25c27c15b6fa7612734c67a74212abf45038f..a7c270f5d671ed422bbcad891ba5d9cab89b15ed 100644
--- a/media/mojo/services/android_mojo_media_client.cc
+++ b/media/mojo/services/android_mojo_media_client.cc
@@ -2,13 +2,9 @@
 // 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 "media/mojo/services/android_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"
@@ -16,6 +12,7 @@
 namespace media {
 
 namespace {
+
 scoped_ptr<ProvisionFetcher> CreateProvisionFetcher(
     mojo::shell::mojom::InterfaceProvider* service_provider) {
   interfaces::ProvisionFetcherPtr provision_fetcher_ptr;
@@ -24,24 +21,17 @@ scoped_ptr<ProvisionFetcher> CreateProvisionFetcher(
       new MojoProvisionFetcher(std::move(provision_fetcher_ptr)));
 }
 
-class AndroidMojoMediaClient : public MojoMediaClient {
- public:
-  AndroidMojoMediaClient() {}
+}  // namespace
 
-  // MojoMediaClient overrides.
-  scoped_ptr<CdmFactory> CreateCdmFactory(
-      mojo::shell::mojom::InterfaceProvider* service_provider) override {
-    return make_scoped_ptr(new AndroidCdmFactory(
-        base::Bind(&CreateProvisionFetcher, service_provider)));
-  }
+AndroidMojoMediaClient::AndroidMojoMediaClient() {}
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(AndroidMojoMediaClient);
-};
-}  // namespace (anonymous)
+AndroidMojoMediaClient::~AndroidMojoMediaClient() {}
 
-scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
-  return make_scoped_ptr(new AndroidMojoMediaClient());
+// MojoMediaClient overrides.
+scoped_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory(
+    mojo::shell::mojom::InterfaceProvider* service_provider) {
+  return make_scoped_ptr(new AndroidCdmFactory(
+      base::Bind(&CreateProvisionFetcher, service_provider)));
 }
 
 }  // namespace media