diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-01 15:42:22 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-01 15:55:43 +0000 |
| commit | 98a0061b881063a62c1941ccb67af6660ca89062 (patch) | |
| tree | 5e77cc6ad4735e53db0d7a8766ed26ca726f9373 /chromium/media | |
| parent | 6c91641271e536ffaa88a1dff5127e42ee99a91e (diff) | |
| download | qtwebengine-chromium-98a0061b881063a62c1941ccb67af6660ca89062.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.34
Change-Id: I89af6c0074347d4415cc1ce35a6d54a3760e6ad2
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/media')
| -rw-r--r-- | chromium/media/base/android/media_drm_bridge.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/media/base/android/media_drm_bridge.cc b/chromium/media/base/android/media_drm_bridge.cc index 4b877be66d8..0633c31b986 100644 --- a/chromium/media/base/android/media_drm_bridge.cc +++ b/chromium/media/base/android/media_drm_bridge.cc @@ -303,12 +303,13 @@ scoped_refptr<MediaDrmBridge> MediaDrmBridge::CreateWithoutSessionSupport( void MediaDrmBridge::SetServerCertificate( const std::vector<uint8_t>& certificate, scoped_ptr<media::SimpleCdmPromise> promise) { - DVLOG(2) << __FUNCTION__; + DVLOG(2) << __FUNCTION__ << "(" << certificate.size() << " bytes)"; DCHECK(!certificate.empty()); JNIEnv* env = AttachCurrentThread(); - ScopedJavaLocalRef<jbyteArray> j_certificate; + ScopedJavaLocalRef<jbyteArray> j_certificate = base::android::ToJavaByteArray( + env, certificate.data(), certificate.size()); if (Java_MediaDrmBridge_setServerCertificate(env, j_media_drm_.obj(), j_certificate.obj())) { promise->resolve(); |