Refactor some code that depends on FFmpeg

media/tools/media_bench/media_bench.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 // Standalone benchmarking application based on FFmpeg.  This tool is used to
 // measure decoding performance between different FFmpeg compile and run-time
 // options.  We also use this tool to measure performance regressions when
 // testing newer builds of FFmpeg from trunk.
 
 #include "build/build_config.h"
 
@@ skipping 10 matching lines @@
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/djb2.h"
 #include "media/base/media.h"
-#include "media/filters/ffmpeg_common.h"
+#include "media/ffmpeg/ffmpeg_common.h"
+#include "media/ffmpeg/file_protocol.h"
 #include "media/filters/ffmpeg_video_decoder.h"
-#include "media/tools/media_bench/file_protocol.h"
 
 namespace switches {
 const char kStream[]       = "stream";
 const char kVideoThreads[] = "video-threads";
 const char kVerbose[]      = "verbose";
 const char kFast2[]        = "fast2";
 const char kSkip[]         = "skip";
 const char kFlush[]        = "flush";
 const char kDjb2[]         = "djb2";
 const char kMd5[]          = "md5";
@@ skipping 490 matching lines @@
 #if defined(OS_WIN)
   } __except(EXCEPTION_EXECUTE_HANDLER) {
     *log_out << "  Exception:" << std::setw(11) << GetExceptionCode()
              << " " << in_path << std::endl;
     return 1;
   }
 #endif
   CommandLine::Reset();
   return 0;
 }