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

webkit/media/buffered_data_source_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "media/base/media_log.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_data_source_host.h"
 #include "media/base/mock_filters.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "webkit/media/buffered_data_source.h"
 #include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
 #include "webkit/media/test_response_generator.h"
 
 using ::testing::_;
 using ::testing::Assign;
 using ::testing::Invoke;
+using ::testing::NiceMock;
 using ::testing::StrictMock;
-using ::testing::NiceMock;
 
 using WebKit::WebFrame;
 using WebKit::WebString;
 using WebKit::WebURLLoader;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
 using webkit_glue::MockWebFrameClient;
 using webkit_glue::MockWebURLLoader;
 
@@ skipping 56 matching lines @@
                                               view_->mainFrame());
     data_source_->set_host(&host_);
   }
 
   virtual ~BufferedDataSourceTest() {
     view_->close();
   }
 
   void Initialize(media::PipelineStatus expected) {
     ExpectCreateResourceLoader();
+
+    EXPECT_CALL(host_, SetNetworkActivity(true));
     data_source_->Initialize(response_generator_.gurl(),
                              media::NewExpectedStatusCB(expected));
     message_loop_.RunAllPending();
   }
 
   // Helper to initialize tests with a valid 206 response.
   void InitializeWith206Response() {
     Initialize(media::PIPELINE_OK);
 
     EXPECT_CALL(host_, SetTotalBytes(response_generator_.content_length()));
@@ skipping 19 matching lines @@
         .WillOnce(Invoke(data_source_.get(),
                          &MockBufferedDataSource::CreateMockResourceLoader));
     message_loop_.RunAllPending();
   }
 
   void Respond(const WebURLResponse& response) {
     loader()->didReceiveResponse(url_loader(), response);
     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();
   }
 
   void FinishLoading() {
     data_source_->set_loading(false);
     loader()->didFinishLoading(url_loader(), 0);
     message_loop_.RunAllPending();
   }
 
   MOCK_METHOD1(ReadCallback, void(int size));
@@ skipping 29 matching lines @@
   MockWebFrameClient client_;
   WebView* view_;
 
   StrictMock<media::MockDataSourceHost> host_;
   MessageLoop message_loop_;
 
  private:
   // Used for calling BufferedDataSource::Read().
   uint8 buffer_[kDataSize];
 
-  // Used for calling BufferedResourceLoader::didReceiveData().
-  char data_[kDataSize];
-
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSourceTest);
 };
 
 TEST_F(BufferedDataSourceTest, Range_Supported) {
   Initialize(media::PIPELINE_OK);
 
   EXPECT_CALL(host_, SetTotalBytes(response_generator_.content_length()));
   Respond(response_generator_.Generate206(0));
 
   EXPECT_TRUE(data_source_->loading());
@@ skipping 220 matching lines @@
   EXPECT_TRUE(data_source_->loading());
   EXPECT_CALL(*this, ReadCallback(media::DataSource::kReadError));
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Read) {
   InitializeWith206Response();
 
   ReadAt(0);
 
-  // When the read completes we'll update our network status.
+  // Receive first half of the read.
+  EXPECT_CALL(host_, AddBufferedByteRange(0, (kDataSize / 2) - 1));
+  ReceiveData(kDataSize / 2);
+
+  // Receive last half of the read.
+  EXPECT_CALL(*this, ReadCallback(kDataSize));
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize - 1));
-  EXPECT_CALL(host_, SetNetworkActivity(true));
-  EXPECT_CALL(*this, ReadCallback(kDataSize));
-  FinishRead();
-
-  // 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)

-  EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize - 1));
+  ReceiveData(kDataSize / 2);
 
   EXPECT_TRUE(data_source_->loading());
   Stop();
 }
 
 }  // namespace webkit_media