Adding callback support to media filter Initialize() and Seek().

media/filters/file_data_source_unittest.cc

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 dd41e88e3ca7cded28a5fa28a5e20a96e2061e45..9c4b9ee8cbce8fe3cc44eb1c9db987ca42f630ed 100644
--- a/media/filters/file_data_source_unittest.cc
+++ b/media/filters/file_data_source_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "media/base/mock_filter_host.h"
+#include "media/base/mock_filters.h"
 #include "media/filters/file_data_source.h"
 
 using ::testing::NiceMock;
@@ -38,13 +39,15 @@ std::string TestFileURL() {
 // Test that FileDataSource call the appropriate methods on its filter host.
 TEST(FileDataSourceTest, OpenFile) {
   StrictMock<MockFilterHost> host;
+  StrictMock<MockFilterCallback> callback;
   EXPECT_CALL(host, SetTotalBytes(10));
   EXPECT_CALL(host, SetBufferedBytes(10));
-  EXPECT_CALL(host, InitializationComplete());
+  EXPECT_CALL(callback, OnFilterCallback());
+  EXPECT_CALL(callback, OnCallbackDestroyed());
 
   scoped_refptr<FileDataSource> filter = new FileDataSource();
   filter->set_host(&host);
-  EXPECT_TRUE(filter->Initialize(TestFileURL()));
+  filter->Initialize(TestFileURL(), callback.NewCallback());
 }
 
 // Use the mock filter host to directly call the Read and GetPosition methods.
@@ -55,9 +58,10 @@ TEST(FileDataSourceTest, ReadData) {
 
   // Create our mock filter host and initialize the data source.
   NiceMock<MockFilterHost> host;
+  NiceMock<MockFilterCallback> callback;
   scoped_refptr<FileDataSource> filter = new FileDataSource();
   filter->set_host(&host);
-  EXPECT_TRUE(filter->Initialize(TestFileURL()));
+  filter->Initialize(TestFileURL(), callback.NewCallback());
 
   EXPECT_TRUE(filter->GetSize(&size));
   EXPECT_EQ(10, size);
@@ -80,4 +84,15 @@ TEST(FileDataSourceTest, ReadData) {
   EXPECT_EQ(10, position);
 }
 
+// Test that FileDataSource does nothing on Seek().
+TEST(FileDataSourceTest, Seek) {
+  StrictMock<MockFilterCallback> callback;
+  EXPECT_CALL(callback, OnFilterCallback());
+  EXPECT_CALL(callback, OnCallbackDestroyed());
+  const base::TimeDelta kZero;
+
+  scoped_refptr<FileDataSource> filter = new FileDataSource();
+  filter->Seek(kZero, callback.NewCallback());
+}
+
 }  // namespace media