Chromium Code Reviews| Index: media/blink/webcontentdecryptionmodulesession_impl.cc |
| diff --git a/media/blink/webcontentdecryptionmodulesession_impl.cc b/media/blink/webcontentdecryptionmodulesession_impl.cc |
| index 05aecdfb0b508b9d48e056c1d1a9eeba0dcefc2f..7549aab935c94b2fb50d0e14348c5fad1a79d2c1 100644 |
| --- a/media/blink/webcontentdecryptionmodulesession_impl.cc |
| +++ b/media/blink/webcontentdecryptionmodulesession_impl.cc |
| @@ -24,8 +24,11 @@ |
| namespace media { |
| -const char kCreateSessionUMAName[] = "CreateSession"; |
| +const char kGenerateRequestUMAName[] = "GenerateRequest"; |
| const char kLoadSessionUMAName[] = "LoadSession"; |
| +const char kUpdateSessionUMAName[] = "UpdateSession"; |
| +const char kCloseSessionUMAName[] = "CloseSession"; |
| +const char kRemoveSessionUMAName[] = "RemoveSession"; |
|
Ilya Sherman
2015/01/27 00:28:31
nit: Mebbe alphabetize?
jrummell
2015/01/27 01:18:21
Done.
|
| // TODO(jrummell): Pass an enum from blink. http://crbug.com/418239. |
| const char kTemporarySessionType[] = "temporary"; |
| @@ -148,7 +151,7 @@ void WebContentDecryptionModuleSessionImpl::initializeNewSession( |
| init_data_type_as_ascii, init_data, |
| base::saturated_cast<int>(init_data_length), session_type_enum, |
| scoped_ptr<NewSessionCdmPromise>(new NewSessionCdmResultPromise( |
| - result, adapter_->GetKeySystemUMAPrefix() + kCreateSessionUMAName, |
| + result, adapter_->GetKeySystemUMAPrefix() + kGenerateRequestUMAName, |
| base::Bind( |
| &WebContentDecryptionModuleSessionImpl::OnSessionInitialized, |
| base::Unretained(this))))); |
| @@ -178,26 +181,28 @@ void WebContentDecryptionModuleSessionImpl::update( |
| blink::WebContentDecryptionModuleResult result) { |
| DCHECK(response); |
| DCHECK(!web_session_id_.empty()); |
| - adapter_->UpdateSession(web_session_id_, response, |
| - base::saturated_cast<int>(response_length), |
| - scoped_ptr<SimpleCdmPromise>( |
| - new CdmResultPromise<>(result, std::string()))); |
| + adapter_->UpdateSession( |
| + web_session_id_, response, base::saturated_cast<int>(response_length), |
| + scoped_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
| + result, adapter_->GetKeySystemUMAPrefix() + kUpdateSessionUMAName))); |
| } |
| void WebContentDecryptionModuleSessionImpl::close( |
| blink::WebContentDecryptionModuleResult result) { |
| DCHECK(!web_session_id_.empty()); |
| - adapter_->CloseSession(web_session_id_, |
| - scoped_ptr<SimpleCdmPromise>( |
| - new CdmResultPromise<>(result, std::string()))); |
| + adapter_->CloseSession( |
| + web_session_id_, |
| + scoped_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
| + result, adapter_->GetKeySystemUMAPrefix() + kCloseSessionUMAName))); |
| } |
| void WebContentDecryptionModuleSessionImpl::remove( |
| blink::WebContentDecryptionModuleResult result) { |
| DCHECK(!web_session_id_.empty()); |
| - adapter_->RemoveSession(web_session_id_, |
| - scoped_ptr<SimpleCdmPromise>( |
| - new CdmResultPromise<>(result, std::string()))); |
| + adapter_->RemoveSession( |
| + web_session_id_, |
| + scoped_ptr<SimpleCdmPromise>(new CdmResultPromise<>( |
| + result, adapter_->GetKeySystemUMAPrefix() + kRemoveSessionUMAName))); |
| } |
| void WebContentDecryptionModuleSessionImpl::release( |