Remove use_system_ffmpeg-related logic from media and other mainline gyp files.

media/base/media_posix.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 "media/base/media.h"
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/stringize_macros.h"
 #include "media/ffmpeg/ffmpeg_common.h"
-
-#if !defined(USE_SYSTEM_FFMPEG)
 #include "third_party/ffmpeg/ffmpeg_stubs.h"
 
 using third_party_ffmpeg::kNumStubModules;
 using third_party_ffmpeg::kModuleFfmpegsumo;
 using third_party_ffmpeg::InitializeStubs;
 using third_party_ffmpeg::StubPathMap;
-#endif  // !defined(USE_SYSTEM_FFMPEG)
 
 namespace media {
 namespace internal {
 
 // Handy to prevent shooting ourselves in the foot with macro wizardry.
 #if !defined(LIBAVCODEC_VERSION_MAJOR) || \
     !defined(LIBAVFORMAT_VERSION_MAJOR) || \
     !defined(LIBAVUTIL_VERSION_MAJOR)
 #error FFmpeg headers not included!
 #endif
 
 #define AVCODEC_VERSION STRINGIZE(LIBAVCODEC_VERSION_MAJOR)
 #define AVFORMAT_VERSION STRINGIZE(LIBAVFORMAT_VERSION_MAJOR)
 #define AVUTIL_VERSION STRINGIZE(LIBAVUTIL_VERSION_MAJOR)
 
 #if defined(OS_MACOSX)
 // TODO(evan): should be using .so like ffmepgsumo here.
 #define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." VERSION ".dylib")
 static const base::FilePath::CharType kSumoLib[] =
     FILE_PATH_LITERAL("ffmpegsumo.so");
 #elif defined(OS_POSIX)
 #define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." VERSION)
 static const base::FilePath::CharType kSumoLib[] =
     FILE_PATH_LITERAL("libffmpegsumo.so");
 #else
 #error "Do not know how to construct DSO name for this OS."
 #endif
 
 bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
-#if defined(USE_SYSTEM_FFMPEG)
-  // No initialization is necessary when using system ffmpeg,
-  // we just link directly with system ffmpeg libraries.
-  return true;
-#else
   StubPathMap paths;
 
   // First try to initialize with Chrome's sumo library.
   DCHECK_EQ(kNumStubModules, 1);
   paths[kModuleFfmpegsumo].push_back(module_dir.Append(kSumoLib).value());
 
   // If that fails, see if any system libraries are available.
   paths[kModuleFfmpegsumo].push_back(module_dir.Append(
       FILE_PATH_LITERAL(DSO_NAME("avutil", AVUTIL_VERSION))).value());
   paths[kModuleFfmpegsumo].push_back(module_dir.Append(
       FILE_PATH_LITERAL(DSO_NAME("avcodec", AVCODEC_VERSION))).value());
   paths[kModuleFfmpegsumo].push_back(module_dir.Append(
       FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value());
 
   return InitializeStubs(paths);
-#endif  // !defined(USE_SYSTEM_FFMPEG)
 }
 
 }  // namespace internal
 }  // namespace media