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 e239269561321f43f605d6119fd29e317108ec40..3a16021b45f0cccceb7b2c77824c27d9a787e7ec 100644
--- a/chromecast/media/mojo/cast_mojo_media_client.cc
+++ b/chromecast/media/mojo/cast_mojo_media_client.cc
@@ -2,31 +2,26 @@
 // 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_application.h"
+#include "chromecast/media/mojo/cast_mojo_media_client.h"
 
-#include "media/mojo/services/mojo_media_client.h"
-
-namespace {
-class CastMojoMediaClient : public ::media::MojoMediaClient {
- public:
-  CastMojoMediaClient() {}
-  ~CastMojoMediaClient() override {}
+namespace chromecast {
+namespace media {
 
-  // MojoMediaClient overrides.
-  void Initialize() override {}
-  scoped_ptr<::media::RendererFactory> CreateRendererFactory(
-      const scoped_refptr<::media::MediaLog>& media_log) override {
-    return scoped_ptr<::media::RendererFactory>();
-  }
+CastMojoMediaClient::CastMojoMediaClient() {}
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(CastMojoMediaClient);
-};
-}  // namespace
+CastMojoMediaClient::~CastMojoMediaClient() {}
 
-namespace media {
 // static
-scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
-  return make_scoped_ptr(new CastMojoMediaClient());
+scoped_ptr<::media::MojoMediaClient> CastMojoMediaClient::Create() {
+  return scoped_ptr<::media::MojoMediaClient>(new CastMojoMediaClient());
 }
+
+void CastMojoMediaClient::Initialize() {}
+
+scoped_ptr<::media::RendererFactory> CastMojoMediaClient::CreateRendererFactory(
+    const scoped_refptr<::media::MediaLog>& /* media_log */) {
+  return scoped_ptr<::media::RendererFactory>();
+}
+
 }  // namespace media
+}  // namespace chromecast