Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

content/browser/media/media_canplaytype_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/media_switches.h"
 #include "media/media_features.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
 
 const char kProbably[] = "probably";
 const char kMaybe[] = "maybe";
 const char kNot[] = "";
 
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 const char* kPropProbably = kProbably;
 const char* kPropMaybe = kMaybe;
 #else
 const char* kPropProbably = kNot;
 const char* kPropMaybe = kNot;
 #endif  // USE_PROPRIETARY_CODECS
 
 #if !defined(OS_ANDROID)
 const char* kOggVideoProbably = kProbably;
 const char* kOggVideoMaybe = kMaybe;
@@ skipping 1650 matching lines @@
             CanPlay("'video/mp4; codecs=\"vp09.02.01.08.02.01.01.00\"'"));
   EXPECT_EQ(mp4_vp9_maybe,
             CanPlay("'video/mp4; codecs=\"vp09.03.01.08.02.01.01.00\"'"));
 }
 
 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing,
                         MediaCanPlayTypeTestMp4Vp9Demuxing,
                         ::testing::Bool());
 
 }  // namespace content