Chromium Code Reviews| Index: content/browser/media/cdm/browser_cdm_manager.cc |
| diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc |
| index 1c1b157968d727916ff94ce14e9389966eac5275..e816dcd79c9f3f6d6dffd91401fa6882e5b1305d 100644 |
| --- a/content/browser/media/cdm/browser_cdm_manager.cc |
| +++ b/content/browser/media/cdm/browser_cdm_manager.cc |
| @@ -346,14 +346,14 @@ void BrowserCdmManager::OnCreateSessionAndGenerateRequest( |
| return; |
| } |
| - media::EmeInitDataType eme_init_data_type = media::EME_INIT_DATA_TYPE_NONE; |
| + media::EmeInitDataType eme_init_data_type = media::EmeInitDataType::NONE; |
|
sandersd (OOO until July 31)
2015/03/23 21:27:30
I'm okay with not initializing to a value here, it
jrummell
2015/03/25 21:44:24
Done. We'll see if any compiler complains.
sandersd (OOO until July 31)
2015/03/25 22:01:28
If you're leaving UNKNOWN in then it's fine to ini
|
| switch (init_data_type) { |
| case INIT_DATA_TYPE_WEBM: |
| - eme_init_data_type = media::EME_INIT_DATA_TYPE_WEBM; |
| + eme_init_data_type = media::EmeInitDataType::WEBM; |
| break; |
| #if defined(USE_PROPRIETARY_CODECS) |
| case INIT_DATA_TYPE_CENC: |
| - eme_init_data_type = media::EME_INIT_DATA_TYPE_CENC; |
| + eme_init_data_type = media::EmeInitDataType::CENC; |
| break; |
| #endif |
| default: |
| @@ -559,11 +559,11 @@ void BrowserCdmManager::CreateSessionAndGenerateRequestIfPermitted( |
| // "audio"/"video" does not matter, so use "video". |
| std::string init_data_type_string; |
| switch (init_data_type) { |
| - case media::EME_INIT_DATA_TYPE_WEBM: |
| + case media::EmeInitDataType::WEBM: |
| init_data_type_string = "video/webm"; |
| break; |
| #if defined(USE_PROPRIETARY_CODECS) |
| - case media::EME_INIT_DATA_TYPE_CENC: |
| + case media::EmeInitDataType::CENC: |
| init_data_type_string = "video/mp4"; |
| break; |
| #endif |