Reland "media: Refactor MojoMediaClient" with fix.

media/mojo/services/android_mojo_media_client.h

Index: media/mojo/services/android_mojo_media_client.h
diff --git a/media/mojo/services/android_mojo_media_client.h b/media/mojo/services/android_mojo_media_client.h
new file mode 100644
index 0000000000000000000000000000000000000000..11a14dbf168a1fb5ce02f00ceb09e6064b009522
--- /dev/null
+++ b/media/mojo/services/android_mojo_media_client.h
@@ -0,0 +1,28 @@
+// Copyright 2014 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.
+
+#ifndef MEDIA_MOJO_SERVICES_ANDROID_MOJO_MEDIA_CLIENT_H_
+#define MEDIA_MOJO_SERVICES_ANDROID_MOJO_MEDIA_CLIENT_H_
+
+#include "base/macros.h"
+#include "media/mojo/services/mojo_media_client.h"
+
+namespace media {
+
+class AndroidMojoMediaClient : public MojoMediaClient {
+ public:
+  AndroidMojoMediaClient();
+  ~AndroidMojoMediaClient() final;
+
+  // MojoMediaClient implementation.
+  scoped_ptr<CdmFactory> CreateCdmFactory(
+      mojo::shell::mojom::InterfaceProvider* service_provider) final;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AndroidMojoMediaClient);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_MOJO_SERVICES_ANDROID_MOJO_MEDIA_CLIENT_H_