Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

android_webview/browser/aw_media_client_android.cc

Index: android_webview/browser/aw_media_client_android.cc
diff --git a/android_webview/browser/aw_media_client_android.cc b/android_webview/browser/aw_media_client_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fc10d99f88cba28ad069d0867355fb37f4aa03e3
--- /dev/null
+++ b/android_webview/browser/aw_media_client_android.cc
@@ -0,0 +1,72 @@
+// 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.
+
+#include "android_webview/browser/aw_media_client_android.h"
+
+#include <utility>
+
+#include "base/logging.h"
+#include "base/stl_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+
+namespace android_webview {
+
+namespace {
+
+const size_t kGUIDLength = 36U;
+
+#define RCHECK(x)                                    \
+  if (!(x)) {                                        \
+    LOG(ERROR) << "Can't parse key-system mapping: " \
+               << key_system_uuid_mapping;           \
+    return std::make_pair("", uuid);                 \
+  }
+
+std::pair<std::string, media::UUID> CreateMappingFromString(
+    const std::string& key_system_uuid_mapping) {
+  std::vector<uint8_t> uuid;
+
+  std::vector<std::string> tokens;
+  Tokenize(key_system_uuid_mapping, ",", &tokens);
+  RCHECK(tokens.size() == 2);
+
+  std::string key_system;
+  base::TrimWhitespaceASCII(tokens[0], base::TRIM_ALL, &key_system);
+
+  std::string guid(tokens[1]);
+  RCHECK(guid.length() == kGUIDLength);
+  base::RemoveChars(guid, "-", &guid);
+  RCHECK(base::HexStringToBytes(guid, &uuid));
+
+  return std::make_pair(key_system, uuid);
+}
+
+}  // namespace
+
+AwMediaClientAndroid::AwMediaClientAndroid(
+    const std::vector<std::string>& key_system_uuid_mappings)
+    : key_system_uuid_mappings_(key_system_uuid_mappings) {
+}
+
+AwMediaClientAndroid::~AwMediaClientAndroid() {
+}
+
+void AwMediaClientAndroid::AddKeySystemUUIDMappings(KeySystemUuidMap* map) {
+  for (const std::string& key_system_uuid_mapping : key_system_uuid_mappings_) {
+    std::pair<std::string, media::UUID> mapping =
+        CreateMappingFromString(key_system_uuid_mapping);
+    if (!mapping.first.empty())
+      map->insert(std::make_pair(mapping.first, mapping.second));

[boliu, 2015/04/29 23:15:44]

|mapping| is already a pair, no?

And probably should use KeySystemUuidMap::value_type instead of using
std::pair<...> everywhere.

[gunsch, 2015/04/29 23:32:16]

Done! Guess I learn something new about C++ every week

+  }
+}
+
+media::MediaDrmBridgeDelegate* AwMediaClientAndroid::GetMediaDrmBridgeDelegate(
+    const media::UUID& scheme_uuid) {
+  if (scheme_uuid == widevine_delegate_.GetUUID())
+    return &widevine_delegate_;
+  return nullptr;
+}
+
+}  // namespace android_webview