Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

content/browser/media/media_redirect_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 "content/public/test/content_browser_test_utils.h"
 #include "media/base/test_data_util.h"
-#include "media/media_features.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 
 namespace content {
 
 // Tests that WebMediaPlayer implementations choose the right playback engine
 // for content even when the playback extension is not known upfront.
 class MediaRedirectTest : public MediaBrowserTest {
  public:
@@ skipping 32 matching lines @@
   }
 
  private:
   const std::string kHiddenPath = "hidden_redirect";
 };
 
 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, CanPlayHiddenWebm) {
   RunRedirectTest("bear.webm");
 }
 
-#if defined(OS_ANDROID) && BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(OS_ANDROID) && defined(USE_PROPRIETARY_CODECS)
 // Flaky, see http://crbug.com/624005
 IN_PROC_BROWSER_TEST_F(MediaRedirectTest, DISABLED_CanPlayHiddenHls) {
   RunRedirectTest("bear.m3u8");
 }
 #endif
 
 }  // namespace content