Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 26fef933deaabb659573d752228620f2b20271a8..cbd8c1a53e214aff64895e06db34135b6afdde48 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -766,6 +766,21 @@
           'proprietary_codecs%': 0,
         }],
 
+        # Widevine CDM is enabled by default for Chrome builds, and is a platform

[DaleCurtis, 2014/12/12 23:07:28]

80 chars.

[sandersd (OOO until July 31), 2014/12/15 21:51:22]

Done.

+        # feature on Android.
+        ['branding=="Chrome" or OS=="android"', {
+          'enable_widevine_cdm%': 1,
+        }, {
+          'enable_widevine_cdm%': 0,
+        }],
+
+        # Widevine is distributed as a component for Mac and Win.

[ddorwin, 2014/12/15 18:31:06]

This should be under/combined with branding==chrome

(Though it's technically not reasonable on Linux or Chrome OS.)

[sandersd (OOO until July 31), 2014/12/15 21:51:22]

Done.

+        ['OS=="mac" or OS=="win"', {
+          'widevine_cdm_is_component%': 1,
+        }, {
+          'widevine_cdm_is_component%': 0,
+        }],
+
         ['OS=="mac" or OS=="ios"', {
           'native_discardable_memory%': 1,
           'native_memory_pressure_signals%': 1,
@@ -1200,6 +1215,8 @@
     'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)',
     'v8_optimized_debug%': '<(v8_optimized_debug)',
     'proprietary_codecs%': '<(proprietary_codecs)',
+    'enable_widevine_cdm%': '<(enable_widevine_cdm)',
+    'widevine_cdm_is_component%': '<(widevine_cdm_is_component)',
     'use_goma%': '<(use_goma)',
     'gomadir%': '<(gomadir)',
     'use_lto%': '<(use_lto)',
@@ -1777,6 +1794,8 @@
         'use_openssl_certs%': 1,
 
         'proprietary_codecs%': '<(proprietary_codecs)',
+        'enable_widevine_cdm%': '<(enable_widevine_cdm)',
+        'widevine_cdm_is_component': '<(widevine_cdm_is_component)',
         'safe_browsing%': 2,
         'enable_web_speech%': 0,
         'java_bridge%': 1,
@@ -2649,6 +2668,12 @@
           }],
         ],
       }],
+      ['enable_widevine_cdm==1', {
+        'defines': ['ENABLE_WIDEVINE_CDM'],

[ddorwin, 2014/12/15 18:31:06]

=1 like in the .gn file?
Same below.

[sandersd (OOO until July 31), 2014/12/15 21:51:22]

Done.

+      }],
+      ['widevine_cdm_is_component==1', {
+        'defines': ['WIDEVINE_CDM_IS_COMPONENT'],
+      }],
       ['enable_viewport==1', {
         'defines': ['ENABLE_VIEWPORT'],
       }],