| Index: chrome/common/chrome_paths.cc
|
| diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
|
| index 86499317e4c2028b723a1ff81878c8cea4d7add8..9958302d88666cc8c64cb56d6454f7c873b55e3a 100644
|
| --- a/chrome/common/chrome_paths.cc
|
| +++ b/chrome/common/chrome_paths.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths_internal.h"
|
| #include "media/cdm/cdm_paths.h"
|
| +#include "ppapi/features/features.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/path_utils.h"
|
| @@ -364,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
| #endif
|
| cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
|
| break;
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
|
| +#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| #if defined(WIDEVINE_CDM_IS_COMPONENT)
|
| case chrome::DIR_COMPONENT_WIDEVINE_CDM:
|
| if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
|
| @@ -382,7 +383,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
| media::GetPlatformSpecificDirectory(kWidevineCdmBaseDirectory));
|
| cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
|
| break;
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
|
| +#endif // defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| case chrome::FILE_RESOURCES_PACK:
|
| #if defined(OS_MACOSX)
|
| cur = base::mac::FrameworkBundlePath();
|
|
|