chrome/browser/load_library_perf_test.cc - Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/load_library_perf_test.cc

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix #endif Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/media/encrypted_media_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/load_library_perf_test.cc

diff --git a/chrome/browser/load_library_perf_test.cc b/chrome/browser/load_library_perf_test.cc

index ec483117650914c1aa6b69d851fa83cc05a414ca..d5958aad9b91448d0cefe3ac4799136eff0f92af 100644

--- a/chrome/browser/load_library_perf_test.cc

+++ b/chrome/browser/load_library_perf_test.cc

@@ -52,7 +52,7 @@ void MeasureSizeAndTimeToLoadNativeLibraryByBaseName(

}

#if defined(ENABLE_PEPPER_CDMS)

-#if defined(WIDEVINE_CDM_AVAILABLE)

+#if defined(ENABLE_WIDEVINE_CDM)

TEST(LoadCDMPerfTest, Widevine) {

MeasureSizeAndTimeToLoadNativeLibrary(

base::FilePath::FromUTF8Unsafe(kWidevineCdmFileName));

@@ -62,7 +62,7 @@ TEST(LoadCDMPerfTest, WidevineAdapter) {

MeasureSizeAndTimeToLoadNativeLibrary(

base::FilePath::FromUTF8Unsafe(kWidevineCdmAdapterFileName));

}

-#endif // defined(WIDEVINE_CDM_AVAILABLE)

+#endif // defined(ENABLE_WIDEVINE_CDM)

TEST(LoadCDMPerfTest, ExternalClearKey) {

#if defined(OS_MACOSX)