Replace Pipeline::SetNetworkActivity() with BufferedDataSource -> WebMediaPlayerImpl callback.

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 b8a88ac27399d5af6633159ff55627c668fb7628..0582d6ec0449122e41ec40e65c732b1bf0bba68a 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -37,7 +37,9 @@ namespace webkit_media {
 class MockBufferedDataSource : public BufferedDataSource {
  public:
   MockBufferedDataSource(MessageLoop* message_loop, WebFrame* frame)
-      : BufferedDataSource(message_loop, frame, new media::MediaLog()),
+      : BufferedDataSource(message_loop, frame, new media::MediaLog(),
+                           base::Bind(&MockBufferedDataSource::set_loading,

[scherkus (not reviewing), 2012/06/12 02:55:04]

I think you need a downloading_ variable instead of loading_.

loading_ is used for simulating the correct WebURLLoaderClient methods in tests
(i.e., calling didFail() if you navigate away from the page) and not for
detecting deferred/undeferred

I'm actually kinda surprised no tests broke! :|

[Ami GONE FROM CHROMIUM, 2012/06/12 03:42:43]

Done.

+                                      base::Unretained(this))),
         loading_(false) {
   }
 
@@ -173,7 +175,6 @@ class BufferedDataSourceTest : public testing::Test {
   int loader_bitrate() { return loader()->bitrate_; }
   int loader_playback_rate() { return loader()->playback_rate_; }
 
-
   scoped_refptr<MockBufferedDataSource> data_source_;
 
   TestResponseGenerator response_generator_;
@@ -432,16 +433,16 @@ TEST_F(BufferedDataSourceTest, Read) {
 
   // 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();
+  EXPECT_TRUE(data_source_->loading());
 
   // During teardown we'll also report our final network status.
-  EXPECT_CALL(host_, SetNetworkActivity(false));
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize - 1));
 
   EXPECT_TRUE(data_source_->loading());
   Stop();
+  EXPECT_FALSE(data_source_->loading());
 }
 
 }  // namespace webkit_media