Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

chrome/browser/media/encrypted_media_istypesupported_browsertest.cc

Index: chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
index 3fd02f1165d235f5a13817b9ea979b39f27f622c..c0a0c636c5fb566bb0a0cb0a46e0f195bb0ec664 100644
--- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
@@ -47,19 +47,19 @@
 // RegisterPepperCdm() cannot set the codecs.
 // TODO(ddorwin): Enable these tests after we have the ability to use the CUS
 // in these tests. See http://crbug.com/356833.
-#if defined(WIDEVINE_CDM_AVAILABLE) && !defined(WIDEVINE_CDM_IS_COMPONENT)
+#if defined(ENABLE_WIDEVINE) && !defined(WIDEVINE_CDM_IS_COMPONENT)
 #define EXPECT_WV EXPECT_TRUE
 #define EXPECT_WVMP4 EXPECT_TRUE
 #define EXPECT_WVAAC EXPECT_TRUE
 #define EXPECT_WVAVC1 EXPECT_TRUE
 #define EXPECT_WVAVC1AAC EXPECT_TRUE
-#else  // defined(WIDEVINE_CDM_AVAILABLE) && !defined(WIDEVINE_CDM_IS_COMPONENT)
+#else  // defined(ENABLE_WIDEVINE) && !defined(WIDEVINE_CDM_IS_COMPONENT)
 #define EXPECT_WV EXPECT_FALSE
 #define EXPECT_WVMP4 EXPECT_FALSE
 #define EXPECT_WVAAC EXPECT_FALSE
 #define EXPECT_WVAVC1 EXPECT_FALSE
 #define EXPECT_WVAVC1AAC EXPECT_FALSE
-#endif  // defined(WIDEVINE_CDM_AVAILABLE) &&
+#endif  // defined(ENABLE_WIDEVINE) &&
         // !defined(WIDEVINE_CDM_IS_COMPONENT)
 
 namespace chrome {
@@ -350,7 +350,7 @@ class EncryptedMediaIsTypeSupportedExternalClearKeyTest
 // For Widevine tests, ensure that the Widevine adapter is loaded.
 class EncryptedMediaIsTypeSupportedWidevineTest
     : public EncryptedMediaIsTypeSupportedTest {
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
+#if defined(ENABLE_WIDEVINE) && defined(ENABLE_PEPPER_CDMS) && \
     defined(WIDEVINE_CDM_IS_COMPONENT)
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) override {
@@ -367,7 +367,7 @@ class EncryptedMediaIsTypeSupportedWidevineTest
     const std::string pepper_name("application/x-ppapi-widevine-cdm");
     RegisterPepperCdm(command_line, adapter_file_name, pepper_name);
   }
-#endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) &&
+#endif  // defined(ENABLE_WIDEVINE) && defined(ENABLE_PEPPER_CDMS) &&
         // defined(WIDEVINE_CDM_IS_COMPONENT)
 };
 
@@ -1142,7 +1142,7 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaIsTypeSupportedTest,
 
   // This will fail in all builds unless widevine is available but not a
   // component, in which case it is registered internally
-#if !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT)
+#if !defined(ENABLE_WIDEVINE) || defined(WIDEVINE_CDM_IS_COMPONENT)
   EXPECT_FALSE(IsConcreteSupportedKeySystem(kWidevineAlpha));
   EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
       "video/webm", no_codecs(), kWidevineAlpha));
@@ -1183,7 +1183,7 @@ IN_PROC_BROWSER_TEST_F(
 // This will fail in all builds unless Widevine is available but not a
 // component, in which case it is registered internally.
 // TODO(xhwang): Define EXPECT_WV and run this test in all cases.
-#if !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT)
+#if !defined(ENABLE_WIDEVINE) || defined(WIDEVINE_CDM_IS_COMPONENT)
 IN_PROC_BROWSER_TEST_F(
     EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest,
     PepperCDMsRegisteredButAdapterNotPresent) {
@@ -1191,7 +1191,7 @@ IN_PROC_BROWSER_TEST_F(
   EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
       "video/webm", no_codecs(), kWidevineAlpha));
 }
-#endif  // !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT)
+#endif  // !defined(ENABLE_WIDEVINE) || defined(WIDEVINE_CDM_IS_COMPONENT)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 }  // namespace chrome