Revert 96974 - Remove mock_ffmpeg and update media unittests.

media/filters/ffmpeg_glue.cc

 // Copyright (c) 2011 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/filters/ffmpeg_glue.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "media/base/filters.h"
 #include "media/ffmpeg/ffmpeg_common.h"
@@ skipping 128 matching lines @@
 
 FFmpegGlue::~FFmpegGlue() {
   av_lockmgr_register(NULL);
 }
 
 // static
 FFmpegGlue* FFmpegGlue::GetInstance() {
   return Singleton<FFmpegGlue>::get();
 }
 
-// static
-URLProtocol* FFmpegGlue::url_protocol() {
-  return &kFFmpegURLProtocol;
-}
-
 std::string FFmpegGlue::AddProtocol(FFmpegURLProtocol* protocol) {
   base::AutoLock auto_lock(lock_);
   std::string key = GetProtocolKey(protocol);
   if (protocols_.find(key) == protocols_.end()) {
     protocols_[key] = protocol;
   }
   return key;
 }
 
 void FFmpegGlue::RemoveProtocol(FFmpegURLProtocol* protocol) {
@@ skipping 20 matching lines @@
 }
 
 std::string FFmpegGlue::GetProtocolKey(FFmpegURLProtocol* protocol) {
   // Use the FFmpegURLProtocol's memory address to generate the unique string.
   // This also has the nice property that adding the same FFmpegURLProtocol
   // reference will not generate duplicate entries.
   return base::StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol));
 }
 
 }  // namespace media