Revert of Reland "media: Refactor MojoMediaClient" with fix.

chromecast/media/mojo/cast_mojo_media_client.cc

Index: chromecast/media/mojo/cast_mojo_media_client.cc
diff --git a/chromecast/media/mojo/cast_mojo_media_client.cc b/chromecast/media/mojo/cast_mojo_media_client.cc
index 3a16021b45f0cccceb7b2c77824c27d9a787e7ec..e239269561321f43f605d6119fd29e317108ec40 100644
--- a/chromecast/media/mojo/cast_mojo_media_client.cc
+++ b/chromecast/media/mojo/cast_mojo_media_client.cc
@@ -2,26 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromecast/media/mojo/cast_mojo_media_client.h"
+#include "media/mojo/services/mojo_media_application.h"
 
-namespace chromecast {
-namespace media {
-
-CastMojoMediaClient::CastMojoMediaClient() {}
+#include "media/mojo/services/mojo_media_client.h"
 
-CastMojoMediaClient::~CastMojoMediaClient() {}
+namespace {
+class CastMojoMediaClient : public ::media::MojoMediaClient {
+ public:
+  CastMojoMediaClient() {}
+  ~CastMojoMediaClient() override {}
 
-// static
-scoped_ptr<::media::MojoMediaClient> CastMojoMediaClient::Create() {
-  return scoped_ptr<::media::MojoMediaClient>(new CastMojoMediaClient());
-}
+  // MojoMediaClient overrides.
+  void Initialize() override {}
+  scoped_ptr<::media::RendererFactory> CreateRendererFactory(
+      const scoped_refptr<::media::MediaLog>& media_log) override {
+    return scoped_ptr<::media::RendererFactory>();
+  }
 
-void CastMojoMediaClient::Initialize() {}
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CastMojoMediaClient);
+};
+}  // namespace
 
-scoped_ptr<::media::RendererFactory> CastMojoMediaClient::CreateRendererFactory(
-    const scoped_refptr<::media::MediaLog>& /* media_log */) {
-  return scoped_ptr<::media::RendererFactory>();
+namespace media {
+// static
+scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
+  return make_scoped_ptr(new CastMojoMediaClient());
 }
-
 }  // namespace media
-}  // namespace chromecast