Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

media/base/android/media_client_android.h

Index: media/base/android/media_client_android.h
diff --git a/media/base/android/media_client_android.h b/media/base/android/media_client_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..0753b3b5e13021f367e97c536cb59913476f4494
--- /dev/null
+++ b/media/base/android/media_client_android.h
@@ -0,0 +1,59 @@
+// 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 MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_
+#define MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "base/containers/hash_tables.h"
+#include "base/macros.h"
+#include "media/base/media_export.h"
+
+namespace media {
+
+class MediaClientAndroid;
+class MediaDrmBridgeDelegate;
+
+// Setter for MediaClientAndroid. This should be called early in embedder
+// lifecycle, before any media playback could occur.
+MEDIA_EXPORT void SetMediaClientAndroid(MediaClientAndroid* media_client);
+
+#if defined(MEDIA_IMPLEMENTATION)
+// Getter for the client. Returns nullptr if no customized client is needed.
+MediaClientAndroid* GetMediaClientAndroid();
+#endif
+
+using UUID = std::vector<uint8_t>;
+
+// A client interface for embedders (e.g. content/browser) to provide customized
+// additions to Android's browser-side media handling.
+class MEDIA_EXPORT MediaClientAndroid {
+ public:
+  typedef base::hash_map<std::string, UUID> KeySystemUuidMap;
+
+  MediaClientAndroid();
+  virtual ~MediaClientAndroid();
+
+  // Adds extra mappings from key-system name to Android UUID into |map|.
+  virtual void AddKeySystemUUIDMappings(KeySystemUuidMap* map);
+
+  // Returns a MediaDrmBridgeDelegate that corresponds to |scheme_uuid|.
+  // MediaClientAndroid retains ownership.
+  virtual media::MediaDrmBridgeDelegate* GetMediaDrmBridgeDelegate(
+      const UUID& scheme_uuid);
+
+ private:
+  friend class KeySystemManager;
+
+  base::hash_map<std::string, UUID> key_system_uuid_map_;
+
+  DISALLOW_COPY_AND_ASSIGN(MediaClientAndroid);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_