Remove mock_ffmpeg and update media unittests.

media/filters/ffmpeg_glue.h

 // 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.
 
 // FFmpegGlue is an adapter for FFmpeg's URLProtocol interface that allows us to
 // use a DataSource implementation with FFmpeg. For convenience we use FFmpeg's
 // av_open_input_file function, which analyzes the filename given to it and
 // automatically initializes the appropriate URLProtocol.
 //
 // Since the DataSource is already open by time we call av_open_input_file, we
@@ skipping 14 matching lines @@
 
 #ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_
 #define MEDIA_FILTERS_FFMPEG_GLUE_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 
+struct URLProtocol;
+
 namespace media {
 
 class FFmpegURLProtocol {
  public:
   FFmpegURLProtocol() {

[scherkus (not reviewing), 2011/08/11 01:26:29]

want to clean these up to {}

[acolwell GONE FROM CHROMIUM, 2011/08/11 23:54:40]

Done.

   }
 
   virtual ~FFmpegURLProtocol() {
   }
 
   // Read the given amount of bytes into data, returns the number of bytes read
   // if successful, kReadError otherwise.
   virtual int Read(int size, uint8* data) = 0;
 
   // Returns true and the current file position for this file, false if the
@@ skipping 42 matching lines @@
   // av_open_input_file as the filename.
   std::string GetProtocolKey(FFmpegURLProtocol* protocol);
 
   // Mutual exclusion while adding/removing items from the map.
   base::Lock lock_;
 
   // Map between keys and FFmpegProtocol references.
   typedef std::map<std::string, FFmpegURLProtocol*> ProtocolMap;
   ProtocolMap protocols_;
 
+  friend class FFmpegGlueTest;
+  static URLProtocol* url_protocol();
+
   DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_GLUE_H_