Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 748 matching lines @@
 
         # Android OS includes support for proprietary codecs regardless of
         # building Chromium or Google Chrome. We also ship Google Chrome and
         # Chromecast with proprietary codecs.
         ['OS=="android" or branding=="Chrome" or chromecast==1', {
           'proprietary_codecs%': 1,
         }, {
           '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,
         }],
 
         # Enable autofill dialog for Android, Mac and Views-enabled platforms.
         ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS=="mac"', {
           'enable_autofill_dialog%': 1,
 
           'conditions': [
@@ skipping 414 matching lines @@
     'native_discardable_memory%': '<(native_discardable_memory)',
     'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
     'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
     'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
     'enable_mdns%' : '<(enable_mdns)',
     'enable_service_discovery%' : '<(enable_service_discovery)',
     'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)',
     '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)',
     'use_lto_o2%': '<(use_lto_o2)',
     'video_hole%': '<(video_hole)',
     'enable_load_completion_hacks%': '<(enable_load_completion_hacks)',
     'support_pre_M6_history_database%': '<(support_pre_M6_history_database)',
     'v8_use_external_startup_data': '<(v8_use_external_startup_data)',
 
     # Whether or not we are building the Athena shell.
@@ skipping 557 matching lines @@
         # breaking assumptions in the build system that when inputs have changed
         # the outputs should always change as well.  This is meant purely for
         # developer builds, to avoid spurious re-linking of native files.
         'optimize_jni_generation%': '<(optimize_jni_generation)',
 
         # Always uses openssl.
         'use_openssl%': 1,
         '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,
         'build_ffmpegsumo%': 0,
         'use_allocator%': 'none',
 
         # Disable Native Client.
         'disable_nacl%': 1,
 
         # Android does not support background apps.
@@ skipping 852 matching lines @@
         'defines': ['ENABLE_WEBRTC=1'],
       }],
       ['proprietary_codecs==1', {
         'defines': ['USE_PROPRIETARY_CODECS'],
         'conditions': [
           ['enable_mpeg2ts_stream_parser==1', {
             'defines': ['ENABLE_MPEG2TS_STREAM_PARSER'],
           }],
         ],
       }],
+      ['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'],
       }],
       ['enable_pepper_cdms==1', {
         'defines': ['ENABLE_PEPPER_CDMS'],
       }],
       ['enable_browser_cdms==1', {
         'defines': ['ENABLE_BROWSER_CDMS'],
       }],
       ['configuration_policy==1', {
@@ skipping 3168 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }