Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

chrome/browser/media/encrypted_media_supported_types_browsertest.cc

 // Copyright 2013 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.
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 54 matching lines @@
 const char kSuccessResult[] = "success";
 const char kUnsupportedResult[] = "Unsupported keySystem";
 const char kNoMatchResult[] =
     "None of the requested configurations were supported.";
 const char kUnexpectedResult[] = "unexpected result";
 
 #define EXPECT_SUCCESS(test) EXPECT_EQ(kSuccessResult, test)
 #define EXPECT_UNKNOWN_KEYSYSTEM(test) EXPECT_EQ(kUnsupportedResult, test)
 #define EXPECT_NO_MATCH(test) EXPECT_EQ(kNoMatchResult, test)
 
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 #define EXPECT_PROPRIETARY EXPECT_SUCCESS
 #else
 #define EXPECT_PROPRIETARY EXPECT_NO_MATCH
 #endif
 
 // Expectations for External Clear Key.
 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
 #define EXPECT_ECK EXPECT_SUCCESS
 #define EXPECT_ECK_PROPRIETARY EXPECT_PROPRIETARY
 #define EXPECT_ECK_NO_MATCH EXPECT_NO_MATCH
@@ skipping 657 matching lines @@
       kVideoWebMMimeType, no_codecs(), kWidevine));
 
   // Clear Key should still be registered.
   EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(
       kVideoWebMMimeType, no_codecs(), kClearKey));
 }
 #endif  // !defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
 }  // namespace chrome