diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 17:49:00 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 17:49:00 +0000 |
| commit | 0f253da52ef4fdb2dde29f3cf5f8ca660e5067ea (patch) | |
| tree | 7b68f0fd3fdcfb672c0311bf455e7f1b3f34f17f /third_party/widevine/cdm | |
| parent | ea79de87234c1865609b94cc06c0474825166f10 (diff) | |
| download | chromium_src-0f253da52ef4fdb2dde29f3cf5f8ca660e5067ea.zip chromium_src-0f253da52ef4fdb2dde29f3cf5f8ca660e5067ea.tar.gz chromium_src-0f253da52ef4fdb2dde29f3cf5f8ca660e5067ea.tar.bz2 | |
Fix a type mismatch on Windows caused by r201738.
The problem was at encrypted_media_browsertest.cc line 167, which is a call to RegisterPepperCdm(), but the right fix is to use ASCII for the constants.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/15658009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/widevine/cdm')
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm_common.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm_common.h b/third_party/widevine/cdm/widevine_cdm_common.h index 144aacb..ec68901 100644 --- a/third_party/widevine/cdm/widevine_cdm_common.h +++ b/third_party/widevine/cdm/widevine_cdm_common.h @@ -26,24 +26,24 @@ const char kWidevineCdmPluginMimeTypeDescription[] = #endif // File name of the CDM on different platforms. -const base::FilePath::CharType kWidevineCdmFileName[] = +const char kWidevineCdmFileName[] = #if defined(OS_MACOSX) - FILE_PATH_LITERAL("widevinecdm.dylib"); + "widevinecdm.dylib"; #elif defined(OS_WIN) - FILE_PATH_LITERAL("widevinecdm.dll"); + "widevinecdm.dll"; #else // OS_LINUX, etc. - FILE_PATH_LITERAL("libwidevinecdm.so"); + "libwidevinecdm.so"; #endif #if defined(ENABLE_PEPPER_CDMS) // File name of the adapter on different platforms. -const base::FilePath::CharType kWidevineCdmAdapterFileName[] = +const char kWidevineCdmAdapterFileName[] = #if defined(OS_MACOSX) - FILE_PATH_LITERAL("widevinecdmadapter.plugin"); + "widevinecdmadapter.plugin"; #elif defined(OS_WIN) - FILE_PATH_LITERAL("widevinecdmadapter.dll"); + "widevinecdmadapter.dll"; #else // OS_LINUX, etc. - FILE_PATH_LITERAL("libwidevinecdmadapter.so"); + "libwidevinecdmadapter.so"; #endif #endif // defined(ENABLE_PEPPER_CDMS) |