Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

chrome/browser/icon_loader_chromeos.cc

 // Copyright (c) 2012 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 "chrome/browser/icon_loader.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "chrome/grit/theme_resources.h"
-#include "media/media_features.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 namespace {
@@ skipping 32 matching lines @@
 const IdrBySize kGenericIdrs = {
   IDR_FILETYPE_GENERIC,
   IDR_FILETYPE_LARGE_GENERIC,
   IDR_FILETYPE_LARGE_GENERIC
 };
 const IdrBySize kImageIdrs = {
   IDR_FILETYPE_IMAGE,
   IDR_FILETYPE_IMAGE,
   IDR_FILETYPE_IMAGE
 };
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 const IdrBySize kPdfIdrs = {
   IDR_FILETYPE_PDF,
   IDR_FILETYPE_PDF,
   IDR_FILETYPE_PDF
 };
 #endif
 const IdrBySize kVideoIdrs = {
   IDR_FILETYPE_VIDEO,
   IDR_FILETYPE_LARGE_VIDEO,
   IDR_FILETYPE_LARGE_VIDEO
 };
 
 IconMapper::IconMapper() {
   // The code below should match translation in
   // ui/file_manager/file_manager/js/file_manager.js
   // ui/file_manager/file_manager/css/file_manager.css
   // 'audio': /\.(mp3|m4a|oga|ogg|wav)$/i,
   // 'html': /\.(html?)$/i,
   // 'image': /\.(bmp|gif|jpe?g|ico|png|webp)$/i,
   // 'pdf' : /\.(pdf)$/i,
   // 'text': /\.(pod|rst|txt|log)$/i,
   // 'video': /\.(mov|mp4|m4v|mpe?g4?|ogm|ogv|ogx|webm)$/i
 
   const ExtensionIconMap::value_type kExtensionIdrBySizeData[] = {
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
     std::make_pair(".m4a", kAudioIdrs),
     std::make_pair(".mp3", kAudioIdrs),
     std::make_pair(".pdf", kPdfIdrs),
     std::make_pair(".3gp", kVideoIdrs),
     std::make_pair(".avi", kVideoIdrs),
     std::make_pair(".m4v", kVideoIdrs),
     std::make_pair(".mov", kVideoIdrs),
     std::make_pair(".mp4", kVideoIdrs),
     std::make_pair(".mpeg", kVideoIdrs),
     std::make_pair(".mpg", kVideoIdrs),
@@ skipping 94 matching lines @@
       LAZY_INSTANCE_INITIALIZER;
   int idr = icon_mapper.Get().Lookup(group_, icon_size_);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(),
                                         IconSizeToDIPSize(icon_size_)));
   image_skia.MakeThreadSafe();
   image_.reset(new gfx::Image(image_skia));
   target_task_runner_->PostTask(
       FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
 }