Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_glue.h

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/filters/ffmpeg_demuxer_unittest.cc ('K') | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_glue.cc » ('j') | media/filters/ffmpeg_glue_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue.h
diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
index a98c50219d1445083f086af4e8637ab4770a7ead..5402410cabeb3a1de925b120572c7d30b1fde136 100644
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -32,6 +32,8 @@
#include "base/memory/singleton.h"
#include "base/synchronization/lock.h"
+struct URLProtocol;
+
namespace media {
class FFmpegURLProtocol {
@@ -99,6 +101,9 @@ class FFmpegGlue {
typedef std::map<std::string, FFmpegURLProtocol*> ProtocolMap;
ProtocolMap protocols_;
+ friend class FFmpegGlueTest;
+ static URLProtocol* url_protocol();
+
DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
};
« media/filters/ffmpeg_demuxer_unittest.cc ('K') | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_glue.cc » ('j') | media/filters/ffmpeg_glue_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698