| Index: chrome/renderer/media/chrome_key_systems.cc
|
| diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
|
| index e8099fba1e9eb23abc16bdaa420b86353a8c3f50..c15d493bb2bcf6497f5572318285c0d7b3e04999 100644
|
| --- a/chrome/renderer/media/chrome_key_systems.cc
|
| +++ b/chrome/renderer/media/chrome_key_systems.cc
|
| @@ -32,19 +32,19 @@ using content::KeySystemInfo;
|
| using content::SupportedCodecs;
|
|
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| -static bool IsPepperCdmRegistered(
|
| +static bool IsPepperCdmAvailable(
|
| const std::string& pepper_type,
|
| std::vector<base::string16>* additional_param_names,
|
| std::vector<base::string16>* additional_param_values) {
|
| - bool is_registered = false;
|
| + bool is_available = false;
|
| content::RenderThread::Get()->Send(
|
| - new ChromeViewHostMsg_IsInternalPluginRegisteredForMimeType(
|
| + new ChromeViewHostMsg_IsInternalPluginAvailableForMimeType(
|
| pepper_type,
|
| - &is_registered,
|
| + &is_available,
|
| additional_param_names,
|
| additional_param_values));
|
|
|
| - return is_registered;
|
| + return is_available;
|
| }
|
|
|
| // External Clear Key (used for testing).
|
| @@ -65,9 +65,9 @@ static void AddExternalClearKey(
|
|
|
| std::vector<base::string16> additional_param_names;
|
| std::vector<base::string16> additional_param_values;
|
| - if (!IsPepperCdmRegistered(kExternalClearKeyPepperType,
|
| - &additional_param_names,
|
| - &additional_param_values)) {
|
| + if (!IsPepperCdmAvailable(kExternalClearKeyPepperType,
|
| + &additional_param_names,
|
| + &additional_param_values)) {
|
| return;
|
| }
|
|
|
| @@ -141,9 +141,9 @@ static void AddPepperBasedWidevine(
|
|
|
| std::vector<base::string16> additional_param_names;
|
| std::vector<base::string16> additional_param_values;
|
| - if (!IsPepperCdmRegistered(kWidevineCdmPluginMimeType,
|
| - &additional_param_names,
|
| - &additional_param_values)) {
|
| + if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType,
|
| + &additional_param_names,
|
| + &additional_param_values)) {
|
| DVLOG(1) << "Widevine CDM is not currently available.";
|
| return;
|
| }
|
|
|