Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

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_
 
-#include "media/media_features.h"
 #include "ppapi/features/features.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 29 matching lines @@
 #else  // OS_LINUX, etc.
     "libwidevinecdmadapter.so";
 #endif
 
 // The following strings are used to communicate supported codecs (from the
 // component manifest) via WebPluginInfo::WebPluginMimeType's additional params.
 const char kCdmSupportedCodecsParamName[] = "codecs";
 const char kCdmSupportedCodecsValueDelimiter = ',';
 const char kCdmSupportedCodecVp8[] = "vp8";
 const char kCdmSupportedCodecVp9[] = "vp9.0";
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 const char kCdmSupportedCodecAvc1[] = "avc1";
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 #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  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
 #endif  // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_