Split BufferedResourceLoader's network callback into separate loading state and progress callbacks.

webkit/media/buffered_data_source_unittest.cc

Index: webkit/media/buffered_data_source_unittest.cc
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc
index a7203cea931fffa6335992a9999fea44bbc70e3d..98d1f83a3e0edf49d70b064d5fa461f250b022b9 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -18,8 +18,8 @@
 using ::testing::_;
 using ::testing::Assign;
 using ::testing::Invoke;
-using ::testing::StrictMock;
 using ::testing::NiceMock;
+using ::testing::StrictMock;
 
 using WebKit::WebFrame;
 using WebKit::WebString;
@@ -96,6 +96,8 @@ class BufferedDataSourceTest : public testing::Test {
 
   void Initialize(media::PipelineStatus expected) {
     ExpectCreateResourceLoader();
+
+    EXPECT_CALL(host_, SetNetworkActivity(true));
     data_source_->Initialize(response_generator_.gurl(),
                              media::NewExpectedStatusCB(expected));
     message_loop_.RunAllPending();
@@ -135,8 +137,11 @@ class BufferedDataSourceTest : public testing::Test {
     message_loop_.RunAllPending();
   }
 
-  void FinishRead() {
-    loader()->didReceiveData(url_loader(), data_, kDataSize, kDataSize);
+  void ReceiveData(int size) {
+    scoped_array<char> data(new char[size]);
+    memset(data.get(), 0xA5, size);  // Arbitrary non-zero value.
+
+    loader()->didReceiveData(url_loader(), data.get(), size, size);
     message_loop_.RunAllPending();
   }
 
@@ -186,9 +191,6 @@ class BufferedDataSourceTest : public testing::Test {
   // Used for calling BufferedDataSource::Read().
   uint8 buffer_[kDataSize];
 
-  // Used for calling BufferedResourceLoader::didReceiveData().
-  char data_[kDataSize];
-
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSourceTest);
 };
 
@@ -429,15 +431,14 @@ TEST_F(BufferedDataSourceTest, Read) {
 
   ReadAt(0);
 
-  // When the read completes we'll update our network status.
-  EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize - 1));
-  EXPECT_CALL(host_, SetNetworkActivity(true));
-  EXPECT_CALL(*this, ReadCallback(kDataSize));
-  FinishRead();
+  // Receive first half of the read.
+  EXPECT_CALL(host_, AddBufferedByteRange(0, (kDataSize / 2) - 1));
+  ReceiveData(kDataSize / 2);
 
-  // During teardown we'll also report our final network status.
-  EXPECT_CALL(host_, SetNetworkActivity(false));

[Ami GONE FROM CHROMIUM, 2012/07/09 00:25:46]

So this is not expected to fire anymore?

[scherkus (not reviewing), 2012/07/09 18:53:30]

The call to Stop() below simulates page navigation by calling didFail() on the
loader

Prior to this CL it would trigger a network event leading to these expectations.
Now that it triggers a load state change of kLoadingFailed we no longer report
anything outside of BDS (see TODO inside BDS::HttpLoadingCallback)

+  // Receive last half of the read.
+  EXPECT_CALL(*this, ReadCallback(kDataSize));
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize - 1));
+  ReceiveData(kDataSize / 2);
 
   EXPECT_TRUE(data_source_->loading());
   Stop();