Use std::vector<uint8_t> instead of uint8*/int for MediaKeys interface

BUG=433446
TEST=media_unittests and EME layout tests pass

Review URL: https://codereview.chromium.org/1072403009

Cr-Commit-Position: refs/heads/master@{#326824}

2 files changed, 15 insertions, 59 deletions

diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc
index 33c10c5..07c3c3e 100644
--- a/chromecast/media/cdm/browser_cdm_cast.cc
+++ b/chromecast/media/cdm/browser_cdm_cast.cc
@@ -68,7 +68,7 @@ void BrowserCdmCast::LoadSession(
 }
 
 void BrowserCdmCast::OnSessionMessage(const std::string& session_id,
-                                      const std::vector<uint8>& message,
+                                      const std::vector<uint8_t>& message,
                                       const GURL& destination_url) {
   // Note: Message type is not supported in Chromecast. Do our best guess here.
   ::media::MediaKeys::MessageType message_type =
@@ -99,31 +99,6 @@ void BrowserCdmCast::OnSessionKeysChange(
   player_tracker_impl_->NotifyNewKey();
 }
 
-void BrowserCdmCast::SetServerCertificateHelper(
-    const std::vector<uint8>& certificate_data,
-    scoped_ptr<::media::SimpleCdmPromise> promise) {
-  SetServerCertificate(certificate_data.data(),
-                       certificate_data.size(),
-                       promise.Pass());
-}
-
-void BrowserCdmCast::CreateSessionAndGenerateRequestHelper(
-    ::media::MediaKeys::SessionType session_type,
-    ::media::EmeInitDataType init_data_type,
-    const std::vector<uint8>& init_data,
-    scoped_ptr<::media::NewSessionCdmPromise> promise) {
-  CreateSessionAndGenerateRequest(
-      session_type, init_data_type, init_data.data(), init_data.size(),
-      promise.Pass());
-}
-
-void BrowserCdmCast::UpdateSessionHelper(
-    const std::string& session_id,
-    const std::vector<uint8>& response,
-    scoped_ptr<::media::SimpleCdmPromise> promise) {
-  UpdateSession(session_id, response.data(), response.size(), promise.Pass());
-}
-
 // A macro runs current member function on |cdm_loop_| thread.
 #define FORWARD_ON_CDM_THREAD(param_fn, ...) \
   cdm_loop_->PostTask( \
@@ -160,29 +135,26 @@ BrowserCdmCast* BrowserCdmCastUi::browser_cdm_cast() const {
 }
 
 void BrowserCdmCastUi::SetServerCertificate(
-    const uint8* certificate_data,
-    int certificate_data_length,
+    const std::vector<uint8_t>& certificate,
     scoped_ptr<::media::SimpleCdmPromise> promise) {
   DCHECK(thread_checker_.CalledOnValidThread());
   FORWARD_ON_CDM_THREAD(
-      SetServerCertificateHelper,
-      std::vector<uint8>(certificate_data,
-                         certificate_data + certificate_data_length),
+      SetServerCertificate,
+      certificate,
       base::Passed(&promise));
 }
 
 void BrowserCdmCastUi::CreateSessionAndGenerateRequest(
     ::media::MediaKeys::SessionType session_type,
     ::media::EmeInitDataType init_data_type,
-    const uint8* init_data,
-    int init_data_length,
+    const std::vector<uint8_t>& init_data,
     scoped_ptr<::media::NewSessionCdmPromise> promise) {
   DCHECK(thread_checker_.CalledOnValidThread());
   FORWARD_ON_CDM_THREAD(
-      CreateSessionAndGenerateRequestHelper,
+      CreateSessionAndGenerateRequest,
       session_type,
       init_data_type,
-      std::vector<uint8>(init_data, init_data + init_data_length),
+      init_data,
       base::Passed(&promise));
 }
 
@@ -197,14 +169,13 @@ void BrowserCdmCastUi::LoadSession(
 
 void BrowserCdmCastUi::UpdateSession(
     const std::string& session_id,
-    const uint8* response,
-    int response_length,
+    const std::vector<uint8_t>& response,
     scoped_ptr<::media::SimpleCdmPromise> promise) {
   DCHECK(thread_checker_.CalledOnValidThread());
   FORWARD_ON_CDM_THREAD(
-      UpdateSessionHelper,
+      UpdateSession,
       session_id,
-      std::vector<uint8>(response, response + response_length),
+      response,
       base::Passed(&promise));
 }
 
diff --git a/chromecast/media/cdm/browser_cdm_cast.h b/chromecast/media/cdm/browser_cdm_cast.h
index 28fb984..1f2d8e7 100644
--- a/chromecast/media/cdm/browser_cdm_cast.h
+++ b/chromecast/media/cdm/browser_cdm_cast.h
@@ -9,6 +9,7 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -67,7 +68,7 @@ class BrowserCdmCast : public ::media::BrowserCdm {
 
  protected:
   void OnSessionMessage(const std::string& session_id,
-                        const std::vector<uint8>& message,
+                        const std::vector<uint8_t>& message,
                         const GURL& destination_url);
   void OnSessionClosed(const std::string& session_id);
   void OnSessionKeysChange(const std::string& session_id,
@@ -76,19 +77,6 @@ class BrowserCdmCast : public ::media::BrowserCdm {
  private:
   friend class BrowserCdmCastUi;
 
-  // Helper methods for forwarding calls to methods that take raw pointers.
-  void SetServerCertificateHelper(
-      const std::vector<uint8>& certificate_data,
-      scoped_ptr<::media::SimpleCdmPromise> promise);
-  void CreateSessionAndGenerateRequestHelper(
-      ::media::MediaKeys::SessionType session_type,
-      ::media::EmeInitDataType init_data_type,
-      const std::vector<uint8>& init_data,
-      scoped_ptr<::media::NewSessionCdmPromise> promise);
-  void UpdateSessionHelper(const std::string& session_id,
-                           const std::vector<uint8>& response,
-                           scoped_ptr<::media::SimpleCdmPromise> promise);
-
   ::media::SessionMessageCB session_message_cb_;
   ::media::SessionClosedCB session_closed_cb_;
   ::media::LegacySessionErrorCB legacy_session_error_cb_;
@@ -122,21 +110,18 @@ class BrowserCdmCastUi : public ::media::BrowserCdm {
  private:
   // ::media::MediaKeys implementation:
   void SetServerCertificate(
-      const uint8* certificate_data,
-      int certificate_data_length,
+      const std::vector<uint8_t>& certificate,
       scoped_ptr<::media::SimpleCdmPromise> promise) override;
   void CreateSessionAndGenerateRequest(
       ::media::MediaKeys::SessionType session_type,
       ::media::EmeInitDataType init_data_type,
-      const uint8* init_data,
-      int init_data_length,
+      const std::vector<uint8_t>& init_data,
       scoped_ptr<::media::NewSessionCdmPromise> promise) override;
   void LoadSession(::media::MediaKeys::SessionType session_type,
                    const std::string& session_id,
                    scoped_ptr<::media::NewSessionCdmPromise> promise) override;
   void UpdateSession(const std::string& session_id,
-                     const uint8* response,
-                     int response_length,
+                     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;