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

chromecast/media/mojo/cast_mojo_media_client.cc

 // Copyright 2016 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 "chromecast/media/mojo/cast_mojo_media_client.h"
+#include "media/mojo/services/mojo_media_application.h"
 
-namespace chromecast {
+#include "media/mojo/services/mojo_media_client.h"
+
+namespace {
+class CastMojoMediaClient : public ::media::MojoMediaClient {
+ public:
+  CastMojoMediaClient() {}
+  ~CastMojoMediaClient() override {}
+
+  // MojoMediaClient overrides.
+  void Initialize() override {}
+  scoped_ptr<::media::RendererFactory> CreateRendererFactory(
+      const scoped_refptr<::media::MediaLog>& media_log) override {
+    return scoped_ptr<::media::RendererFactory>();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CastMojoMediaClient);
+};
+}  // namespace
+
 namespace media {
-
-CastMojoMediaClient::CastMojoMediaClient() {}
-
-CastMojoMediaClient::~CastMojoMediaClient() {}
-
 // static
-scoped_ptr<::media::MojoMediaClient> CastMojoMediaClient::Create() {
-  return scoped_ptr<::media::MojoMediaClient>(new CastMojoMediaClient());
+scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
+  return make_scoped_ptr(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