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 "content/browser/media/android/media_drm_credential_manager.h" | 5 #include "content/browser/media/android/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" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 success = false; | 83 success = false; |
84 } | 84 } |
85 | 85 |
86 base::ResetAndReturn(&reset_credentials_cb_).Run(success); | 86 base::ResetAndReturn(&reset_credentials_cb_).Run(success); |
87 media_drm_bridge_.reset(); | 87 media_drm_bridge_.reset(); |
88 } | 88 } |
89 | 89 |
90 bool MediaDrmCredentialManager::ResetCredentialsInternal( | 90 bool MediaDrmCredentialManager::ResetCredentialsInternal( |
91 SecurityLevel security_level) { | 91 SecurityLevel security_level) { |
92 media_drm_bridge_ = | 92 media_drm_bridge_ = |
93 media::MediaDrmBridge::CreateSessionless(kWidevineKeySystem); | 93 media::MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem); |
94 if (!media_drm_bridge_) | 94 if (!media_drm_bridge_) |
95 return false; | 95 return false; |
96 | 96 |
97 ResetCredentialsCB reset_credentials_cb = | 97 ResetCredentialsCB reset_credentials_cb = |
98 base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted, | 98 base::Bind(&MediaDrmCredentialManager::OnResetCredentialsCompleted, |
99 base::Unretained(this), security_level); | 99 base::Unretained(this), security_level); |
100 | 100 |
101 if (!media_drm_bridge_->SetSecurityLevel(security_level)) { | 101 if (!media_drm_bridge_->SetSecurityLevel(security_level)) { |
102 // No need to reset credentials for unsupported |security_level|. | 102 // No need to reset credentials for unsupported |security_level|. |
103 base::MessageLoopProxy::current()->PostTask( | 103 base::MessageLoopProxy::current()->PostTask( |
104 FROM_HERE, base::Bind(reset_credentials_cb, true)); | 104 FROM_HERE, base::Bind(reset_credentials_cb, true)); |
105 return true; | 105 return true; |
106 } | 106 } |
107 | 107 |
108 media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb); | 108 media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb); |
109 return true; | 109 return true; |
110 } | 110 } |
111 | 111 |
112 // static | 112 // static |
113 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) { | 113 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) { |
114 return RegisterNativesImpl(env); | 114 return RegisterNativesImpl(env); |
115 } | 115 } |
116 | 116 |
117 } // namespace content | 117 } // namespace content |
OLD | NEW |