Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'.

third_party/widevine/cdm/widevine_cdm_common.h

 // 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.
 
 #ifndef WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
 #define WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_
 
+#if defined(ENABLE_WIDEVINE_CDM)
+
 #include "base/files/file_path.h"
 
 // This file defines constants common to all Widevine CDM versions.
 
 // Widevine CDM version contains 4 components, e.g. 1.4.0.195.
 const int kWidevineCdmVersionNumComponents = 4;
 
 // "alpha" is a temporary name until a convention is defined.
 const char kWidevineKeySystem[] = "com.widevine.alpha";
 
@@ skipping 34 matching lines @@
 // component manifest) via WebPluginInfo::WebPluginMimeType's additional params.
 const char kCdmSupportedCodecsParamName[] = "codecs";
 const char kCdmSupportedCodecsValueDelimiter = ',';
 const char kCdmSupportedCodecVorbis[] = "vorbis";
 const char kCdmSupportedCodecVp8[] = "vp8";
 const char kCdmSupportedCodecVp9[] = "vp9.0";
 #if defined(USE_PROPRIETARY_CODECS)
 const char kCdmSupportedCodecAac[] = "aac";
 const char kCdmSupportedCodecAvc1[] = "avc1";
 #endif  // defined(USE_PROPRIETARY_CODECS)
 

[ddorwin, 2014/12/15 21:56:48]

Restore #endif  // defined(ENABLE_PEPPER_CDMS) below.

-#if defined(OS_MACOSX) || defined(OS_WIN)
-// CDM is installed by the component installer instead of the Chrome installer.
-#define WIDEVINE_CDM_IS_COMPONENT
-#endif  // defined(OS_MACOSX) || defined(OS_WIN)
-#endif  // defined(ENABLE_PEPPER_CDMS)
+#endif  // defined(ENABLE_WIDEVINE_CDM)
 
 #endif  // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_