summaryrefslogtreecommitdiffstats
path: root/media/base/mock_reader.h
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 00:54:18 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 00:54:18 +0000
commitd0f914b1965c44d92beb46480135390b73ae3e10 (patch)
tree04d39187483252e360ee35cc94b5ff92ee685b78 /media/base/mock_reader.h
parentbedb4a2725ebe735e4f8f1294b931e38dfb88ddc (diff)
downloadchromium_src-d0f914b1965c44d92beb46480135390b73ae3e10.zip
chromium_src-d0f914b1965c44d92beb46480135390b73ae3e10.tar.gz
chromium_src-d0f914b1965c44d92beb46480135390b73ae3e10.tar.bz2
Refactor media pipeline and filters to use injected message loops.
Message loops are provided via MediaFilter::SetMessageLoop(). For now FFmpegDemuxer is the only filter taking advantage of injected message loops, and its unit tests have been updated as well. TEST=FFmpegDemuxer tests should continue to run BUG=none Review URL: http://codereview.chromium.org/145014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/mock_reader.h')
-rw-r--r--media/base/mock_reader.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/media/base/mock_reader.h b/media/base/mock_reader.h
index ad8db88..3640981 100644
--- a/media/base/mock_reader.h
+++ b/media/base/mock_reader.h
@@ -21,8 +21,7 @@ class MockReader :
public:
MockReader()
: called_(false),
- expecting_call_(false),
- wait_for_read_(false, false) {
+ expecting_call_(false) {
}
virtual ~MockReader() {
@@ -34,7 +33,6 @@ class MockReader :
expecting_call_ = false;
called_ = false;
buffer_ = NULL;
- wait_for_read_.Reset();
}
// Executes an asynchronous read on the given filter.
@@ -45,12 +43,6 @@ class MockReader :
filter->Read(NewCallback(this, &MockReader::OnReadComplete));
}
- // Waits 500ms for the read callback to be completed. Returns true if the
- // read was completed, false otherwise.
- bool WaitForRead() {
- return wait_for_read_.TimedWait(base::TimeDelta::FromMilliseconds(500));
- }
-
// Mock accessors.
BufferType* buffer() { return buffer_; }
bool called() { return called_; }
@@ -63,7 +55,6 @@ class MockReader :
expecting_call_ = false;
called_ = true;
buffer_ = buffer;
- wait_for_read_.Signal();
}
// Reference to the buffer provided in the callback.
@@ -75,9 +66,6 @@ class MockReader :
// Whether or not this reader was expecting a callback.
bool expecting_call_;
- // Used by tests to wait for the callback to be executed.
- base::WaitableEvent wait_for_read_;
-
DISALLOW_COPY_AND_ASSIGN(MockReader);
};