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

media/mojo/services/mojo_media_client.h

Index: media/mojo/services/mojo_media_client.h
diff --git a/media/mojo/services/mojo_media_client.h b/media/mojo/services/mojo_media_client.h
index 2798aaaaf4721a29c022cff2b451e167f26b4bc2..4e4d39bddcba5d6de13dc050065a9355835167ed 100644
--- a/media/mojo/services/mojo_media_client.h
+++ b/media/mojo/services/mojo_media_client.h
@@ -5,16 +5,13 @@
 #ifndef MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_
 #define MEDIA_MOJO_SERVICES_MOJO_MEDIA_CLIENT_H_
 
+#include "base/single_thread_task_runner.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/media_log.h"
 #include "media/base/renderer_factory.h"
 #include "media/base/video_renderer_sink.h"
 
-namespace base {
-class SingleThreadTaskRunner;
-}
-
 namespace mojo {
 namespace shell {
 namespace mojom {
@@ -29,6 +26,8 @@ class MojoMediaClient {
  public:
   virtual ~MojoMediaClient();
 
+  static scoped_ptr<MojoMediaClient> Create();
+
   // Called exactly once before any other method.
   virtual void Initialize();
   // Returns the RendererFactory to be used by MojoRendererService. If returns