Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h" | 5 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/scoped_java_ref.h" | 8 #include "base/android/scoped_java_ref.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| 11 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
| 13 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
| 14 #include "chrome/browser/browser_process.h" | |
| 15 #include "content/public/browser/android/provision_fetcher_factory.h" | |
| 14 #include "jni/MediaDrmCredentialManager_jni.h" | 16 #include "jni/MediaDrmCredentialManager_jni.h" |
| 15 #include "media/base/android/media_drm_bridge.h" | 17 #include "media/base/android/media_drm_bridge.h" |
| 18 #include "media/base/android/provision_fetcher.h" | |
| 16 #include "url/gurl.h" | 19 #include "url/gurl.h" |
| 17 | 20 |
| 18 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 21 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
| 19 | 22 |
| 20 using base::android::ScopedJavaGlobalRef; | 23 using base::android::ScopedJavaGlobalRef; |
| 21 | 24 |
| 22 namespace { | 25 namespace { |
| 23 | 26 |
| 24 void MediaDrmCredentialManagerCallback( | 27 void MediaDrmCredentialManagerCallback( |
| 25 const ScopedJavaGlobalRef<jobject>& j_media_drm_credential_manager_callback, | 28 const ScopedJavaGlobalRef<jobject>& j_media_drm_credential_manager_callback, |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 success = false; | 85 success = false; |
| 83 } | 86 } |
| 84 | 87 |
| 85 base::ResetAndReturn(&reset_credentials_cb_).Run(success); | 88 base::ResetAndReturn(&reset_credentials_cb_).Run(success); |
| 86 media_drm_bridge_ = nullptr; | 89 media_drm_bridge_ = nullptr; |
| 87 } | 90 } |
| 88 | 91 |
| 89 // TODO(ddorwin): The key system should be passed in. http://crbug.com/459400 | 92 // TODO(ddorwin): The key system should be passed in. http://crbug.com/459400 |
| 90 bool MediaDrmCredentialManager::ResetCredentialsInternal( | 93 bool MediaDrmCredentialManager::ResetCredentialsInternal( |
| 91 SecurityLevel security_level) { | 94 SecurityLevel security_level) { |
| 92 media_drm_bridge_ = | 95 // Create provision fetcher for the default browser http request context. |
| 93 media::MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem); | 96 DCHECK(g_browser_process); |
|
qinmin
2015/11/13 19:07:40
nit: no need for this, if this is null, the follow
Tima Vaisburd
2015/11/13 21:04:43
Removed.
| |
| 97 scoped_ptr<media::ProvisionFetcher> provision_fetcher = | |
| 98 content::CreateProvisionFetcher( | |
| 99 g_browser_process->system_request_context()); | |
| 100 | |
| 101 media_drm_bridge_ = media::MediaDrmBridge::CreateWithoutSessionSupport( | |
| 102 kWidevineKeySystem, provision_fetcher.Pass()); | |
| 94 if (!media_drm_bridge_) | 103 if (!media_drm_bridge_) |
| 95 return false; | 104 return false; |
| 96 | 105 |
| 97 ResetCredentialsCB reset_credentials_cb = | 106 ResetCredentialsCB reset_credentials_cb = |
| 98 base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted, | 107 base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted, |
| 99 base::Unretained(this), security_level); | 108 base::Unretained(this), security_level); |
| 100 | 109 |
| 101 if (!media_drm_bridge_->SetSecurityLevel(security_level)) { | 110 if (!media_drm_bridge_->SetSecurityLevel(security_level)) { |
| 102 // No need to reset credentials for unsupported |security_level|. | 111 // No need to reset credentials for unsupported |security_level|. |
| 103 base::ThreadTaskRunnerHandle::Get()->PostTask( | 112 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 104 FROM_HERE, base::Bind(reset_credentials_cb, true)); | 113 FROM_HERE, base::Bind(reset_credentials_cb, true)); |
| 105 return true; | 114 return true; |
| 106 } | 115 } |
| 107 | 116 |
| 108 media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb); | 117 media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb); |
| 109 return true; | 118 return true; |
| 110 } | 119 } |
| 111 | 120 |
| 112 // static | 121 // static |
| 113 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) { | 122 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) { |
| 114 return RegisterNativesImpl(env); | 123 return RegisterNativesImpl(env); |
| 115 } | 124 } |
| OLD | NEW |