Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

android_webview/browser/aw_media_client_android.h

Index: android_webview/browser/aw_media_client_android.h
diff --git a/android_webview/browser/aw_media_client_android.h b/android_webview/browser/aw_media_client_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..94f2641c6703fac0f1f1709a78613509853db9f0
--- /dev/null
+++ b/android_webview/browser/aw_media_client_android.h
@@ -0,0 +1,37 @@
+// Copyright 2015 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 ANDROID_WEBVIEW_BROWSER_AW_MEDIA_CLIENT_ANDROID_H_
+#define ANDROID_WEBVIEW_BROWSER_AW_MEDIA_CLIENT_ANDROID_H_
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "media/base/android/media_client_android.h"
+
+namespace android_webview {
+
+class AwMediaClientAndroid : public media::MediaClientAndroid {
+ public:
+  // |key_system_uuid_mappings| is a list of strings containing key-system/UUID
+  // pairs, in the format "key system name,UUID as string".
+  explicit AwMediaClientAndroid(
+      const std::vector<std::string>& key_system_uuid_mappings);
+  ~AwMediaClientAndroid() override;
+
+ private:
+  // media::MediaClientAndroid implementation:
+  std::vector<std::pair<std::string, std::vector<uint8_t>>>
+      GetKeySystemUUIDMappings() const override;
+  media::MediaDrmBridgeDelegate* GetMediaDrmBridgeDelegate(
+      const std::vector<uint8_t>& scheme_uuid) const override;
+
+  std::vector<std::pair<std::string, std::vector<uint8_t>>> mappings_;
+  scoped_ptr<media::MediaDrmBridgeDelegate> widevine_delegate_;

[xhwang, 2015/04/24 04:52:22]

nit: just store cdm::WidevineDrmDelegateAndroid widevine_delegate_?

[gunsch, 2015/04/27 23:44:10]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(AwMediaClientAndroid);
+};
+
+}  // namespace android_webview
+
+#endif  // ANDROID_WEBVIEW_BROWSER_AW_MEDIA_CLIENT_ANDROID_H_