Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/android/media_drm_proxy.h

Index: media/base/android/media_drm_proxy.h
diff --git a/media/base/android/media_drm_proxy.h b/media/base/android/media_drm_proxy.h
new file mode 100644
index 0000000000000000000000000000000000000000..89b10bceac358d0c51a4f01614b18d7b02f73dbc
--- /dev/null
+++ b/media/base/android/media_drm_proxy.h
@@ -0,0 +1,109 @@
+// Copyright (c) 2013 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_DRM_PROXY_H_
+#define MEDIA_BASE_ANDROID_MEDIA_DRM_PROXY_H_
+
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "media/base/android/media_drm_bridge.h"
+#include "media/base/browser_cdm.h"
+
+namespace media {
+
+// This class delegates MediaDrmBridge calls onto the Media thread
+class MEDIA_EXPORT MediaDrmProxy : public BrowserCdm {
+ public:
+  ~MediaDrmProxy() override;
+  void DeleteOnCorrectThread() override;
+
+  // Returns a MediaDrmBridge instance if |key_system| is supported, or a NULL
+  // pointer otherwise.
+  // TODO(xhwang): Is it okay not to update session expiration info?
+  static scoped_ptr<MediaDrmProxy, BrowserCdmDeleter> Create(
+      const std::string& key_system,
+      MediaDrmBridge::SecurityLevel widevine_security_level,
+      const SessionMessageCB& session_message_cb,
+      const SessionClosedCB& session_closed_cb,
+      const LegacySessionErrorCB& legacy_session_error_cb,
+      const SessionKeysChangeCB& session_keys_change_cb,
+      const SessionExpirationUpdateCB& session_expiration_update_cb);
+
+  // MediaKeys (via BrowserCdm) implementation.
+
+  void SetServerCertificate(
+      const std::vector<uint8_t>& certificate,
+      scoped_ptr<media::SimpleCdmPromise> promise) override;
+  void CreateSessionAndGenerateRequest(
+      SessionType session_type,
+      media::EmeInitDataType init_data_type,
+      const std::vector<uint8_t>& init_data,
+      scoped_ptr<media::NewSessionCdmPromise> promise) override;
+  void LoadSession(SessionType session_type,
+                   const std::string& session_id,
+                   scoped_ptr<media::NewSessionCdmPromise> promise) override;
+  void UpdateSession(const std::string& session_id,
+                     const std::vector<uint8_t>& response,
+                     scoped_ptr<media::SimpleCdmPromise> promise) override;
+  void CloseSession(const std::string& session_id,
+                    scoped_ptr<media::SimpleCdmPromise> promise) override;
+  void RemoveSession(const std::string& session_id,
+                     scoped_ptr<media::SimpleCdmPromise> promise) override;
+  CdmContext* GetCdmContext() override;
+
+  // PlayerTracker (via BrowserCdm) implementation.
+
+  int RegisterPlayer(const base::Closure& new_key_cb,
+                     const base::Closure& cdm_unset_cb) override;
+  void UnregisterPlayer(int registration_id) override;
+
+  // Accessor for MediaDrmBridge
+  MediaDrmBridge* GetDrmBridge();
+
+ private:
+  MediaDrmProxy(const std::string& key_system,
+                MediaDrmBridge::SecurityLevel widevine_security_level,
+                const SessionMessageCB& session_message_cb,
+                const SessionClosedCB& session_closed_cb,
+                const LegacySessionErrorCB& legacy_session_error_cb,
+                const SessionKeysChangeCB& session_keys_change_cb,
+                const SessionExpirationUpdateCB& session_expiration_update_cb);
+
+  // Helper method to create MediaDrmBridge on the Media thread.
+  void Initialize();
+
+  // Data.
+
+  // Object for posting tasks on UI thread.
+  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
+
+  // MediaDrmBridge that will be accessed on the Media thread.
+  scoped_ptr<MediaDrmBridge, BrowserCdmDeleter> media_drm_bridge_;
+
+  // The key system.
+  std::string key_system_;
+
+  // Required security level. Only makes sense for Widevine system.
+  MediaDrmBridge::SecurityLevel widevine_security_level_;
+
+  // Callbacks received as parameters, to be called on UI thread
+  SessionMessageCB session_message_cb_;
+  SessionClosedCB session_closed_cb_;
+  LegacySessionErrorCB legacy_session_error_cb_;
+  SessionKeysChangeCB session_keys_change_cb_;
+  SessionExpirationUpdateCB session_expiration_update_cb_;
+
+  base::WeakPtr<MediaDrmProxy> media_weak_this_;
+
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<MediaDrmProxy> media_weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(MediaDrmProxy);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_PROXY_H_