Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

content/browser/media/media_color_browsertest.cc

 // Copyright 2016 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 "build/build_config.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/test_data_util.h"
-#include "media/media_features.h"
 
 namespace content {
 
 class MediaColorTest : public MediaBrowserTest {
  public:
   void RunColorTest(const std::string& video_file) {
     base::FilePath path = media::GetTestDataFilePath("blackwhite.html");
     std::string final_title =
         RunTest(GetFileUrlWithQuery(path, video_file), kEnded);
     EXPECT_EQ(kEnded, final_title);
@@ skipping 16 matching lines @@
 #endif  // !defined(OS_ANDROID)
 
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pVp8) {
   RunColorTest("yuv420p.webm");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pVp9) {
   RunColorTest("yuv444p.webm");
 }
 
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 
 // This fails on some Android devices: http://crbug.com/649199,
 // http://crbug.com/649185.
 #if defined(OS_ANDROID)
 #define MAYBE_Yuv420pH264 DISABLED_Yuv420pH264
 #else
 #define MAYBE_Yuv420pH264 Yuv420pH264
 #endif
 IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuv420pH264) {
   RunColorTest("yuv420p.mp4");
@@ skipping 36 matching lines @@
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pH264) {
   RunColorTest("yuv444p.mp4");
 }
 #endif  // !defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pMpeg4) {
   RunColorTest("yuv420p.avi");
 }
 #endif  // defined(OS_CHROMEOS)
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 }  // namespace content