Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

media/base/audio_video_metadata_extractor_unittest.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 "media/base/audio_video_metadata_extractor.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "build/build_config.h"
 #include "media/base/test_data_util.h"
 #include "media/filters/file_data_source.h"
-#include "media/media_features.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 std::unique_ptr<AudioVideoMetadataExtractor> GetExtractor(
     const std::string& filename,
     bool extract_attached_images,
     bool expected_result,
     double expected_duration,
     int expected_width,
@@ skipping 92 matching lines @@
   EXPECT_EQ(0u, extractor->stream_infos()[4].tags.size());
 
   EXPECT_EQ("pcm_s16le", extractor->stream_infos()[5].type);
   EXPECT_EQ(1u, extractor->stream_infos()[5].tags.size());
   EXPECT_EQ("Lavc52.32.0",
             GetTagValue(extractor->stream_infos()[5].tags, "ENCODER"));
 
   EXPECT_EQ(0u, extractor->attached_images_bytes().size());
 }
 
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 TEST(AudioVideoMetadataExtractorTest, AndroidRotatedMP4Video) {
   std::unique_ptr<AudioVideoMetadataExtractor> extractor =
       GetExtractor("90rotation.mp4", true, true, 0, 1920, 1080);
 
   EXPECT_EQ(90, extractor->rotation());
 
   EXPECT_EQ(3u, extractor->stream_infos().size());
 
   EXPECT_EQ("mov,mp4,m4a,3gp,3g2,mj2", extractor->stream_infos()[0].type);
   EXPECT_EQ(4u, extractor->stream_infos()[0].tags.size());
@@ skipping 68 matching lines @@
             extractor->attached_images_bytes()[0].substr(0, 8));
   EXPECT_EQ("IEND\xae\x42\x60\x82",
             extractor->attached_images_bytes()[0].substr(
                 extractor->attached_images_bytes()[0].size() - 8, 8));
   EXPECT_EQ("\xF3\xED\x8F\xC7\xC7\x98\xB9V|p\xC0u!\xB5\x82\xCF\x95\xF0\xCD\xCE",
             base::SHA1HashString(extractor->attached_images_bytes()[0]));
 }
 #endif
 
 }  // namespace media