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

Unified Diff: media/filters/file_data_source_unittest.cc

Issue 8936014: Removing DataSource from Filter hierarchy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved preload into a separate file. Created 9 years 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
Index: media/filters/file_data_source_unittest.cc
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc
index 9d781a31224a1b3d89c2fc01f750d8161fcd3c53..bac45d91ef8a41e35d26212ea8f0edb9ac7fe725 100644
--- a/media/filters/file_data_source_unittest.cc
+++ b/media/filters/file_data_source_unittest.cc
@@ -10,7 +10,7 @@
#include "base/path_service.h"
#include "base/utf_string_conversions.h"
#include "media/base/mock_callback.h"
-#include "media/base/mock_filter_host.h"
+#include "media/base/mock_data_source_host.h"
#include "media/base/mock_filters.h"
#include "media/filters/file_data_source.h"
@@ -51,7 +51,7 @@ std::string TestFileURL() {
// Test that FileDataSource call the appropriate methods on its filter host.
TEST(FileDataSourceTest, OpenFile) {
- StrictMock<MockFilterHost> host;
+ StrictMock<MockDataSourceHost> host;
EXPECT_CALL(host, SetTotalBytes(10));
EXPECT_CALL(host, SetBufferedBytes(10));
@@ -68,7 +68,7 @@ TEST(FileDataSourceTest, ReadData) {
uint8 ten_bytes[10];
// Create our mock filter host and initialize the data source.
- NiceMock<MockFilterHost> host;
+ NiceMock<MockDataSourceHost> host;
scoped_refptr<FileDataSource> filter(new FileDataSource());
filter->set_host(&host);
@@ -97,14 +97,4 @@ TEST(FileDataSourceTest, ReadData) {
filter->Stop(NewExpectedClosure());
}
-// Test that FileDataSource does nothing on Seek().
-TEST(FileDataSourceTest, Seek) {
- const base::TimeDelta kZero;
-
- scoped_refptr<FileDataSource> filter(new FileDataSource());
- filter->Seek(kZero, NewExpectedStatusCB(PIPELINE_OK));
-
- filter->Stop(NewExpectedClosure());
-}
-
} // namespace media
« no previous file with comments | « media/filters/file_data_source.cc ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698