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..a090bf612f1b823641548dca33425eb856f5dfce
--- /dev/null
+++ b/android_webview/browser/aw_media_client_android.h
@@ -0,0 +1,38 @@
+// 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 cdm {
+class WidevineDrmDelegateAndroid;
+}
+
+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:
+  media::MediaDrmBridgeDelegate* GetMediaDrmBridgeDelegate(
+      const media::UUID& scheme_uuid) const override;
+
+  scoped_ptr<cdm::WidevineDrmDelegateAndroid> widevine_delegate_;

[xhwang, 2015/04/28 05:25:11]

nit: I was saying just have:

cdm::WidevineDrmDelegateAndroid widevine_delegate_;

[gunsch, 2015/04/28 18:50:51]

Can't do without either:
a) making GetMediaDrmBridgeDelegate non-const (|&widevine_delegate_| in a
|const| method gives me a |const cdm::WidevineDrmDelegateAndroid*|)
b) using a const_cast in the implementation

I'd rather leave the scoped_ptr than either (a) or (b), but if you feel either
of those are cleaner I'll switch.

[xhwang, 2015/04/28 19:00:38]

I didn't notice the "const" part :)

Having a const method returning a non-const pointer to a class member isn't a
great pattern either. There's no fundamental differences here about what we are
really doing. So dropping the "const" in  GetMediaDrmBridgeDelegate() sgtm. But
I don't have strong opinions on this :)

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