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

webkit/media/buffered_data_source.cc

Index: webkit/media/buffered_data_source.cc
diff --git a/webkit/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
index 3193a1ca523cda4600e65376f7687368b4bf1808..55c91496ab96918042a22be81d2ab26b4b4f2545 100644
--- a/webkit/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -25,13 +25,13 @@ static const int kNumCacheMissRetries = 3;
 BufferedDataSource::BufferedDataSource(
     MessageLoop* render_loop,
     WebFrame* frame,
-    media::MediaLog* media_log)
+    media::MediaLog* media_log,
+    const DownloadingCB& downloading_cb)
     : total_bytes_(kPositionNotSpecified),
       buffered_bytes_(0),
       streaming_(false),
       frame_(frame),
       loader_(NULL),
-      is_downloading_data_(false),
       read_size_(0),
       read_buffer_(NULL),
       last_read_start_(0),
@@ -45,7 +45,8 @@ BufferedDataSource::BufferedDataSource(
       cache_miss_retries_left_(kNumCacheMissRetries),
       bitrate_(0),
       playback_rate_(0.0),
-      media_log_(media_log) {
+      media_log_(media_log),
+      downloading_cb_(downloading_cb) {
 }
 
 BufferedDataSource::~BufferedDataSource() {}
@@ -549,7 +550,9 @@ void BufferedDataSource::NetworkEventCallback() {
   if (!url_.SchemeIs(kHttpScheme) && !url_.SchemeIs(kHttpsScheme))
     return;
 
-  bool is_downloading_data = loader_->is_downloading_data();
+  if (!downloading_cb_.is_null())

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

all clients provide a downloading_cb_ and docs in .h don't state what DownloadCB
does and whether it's required/optional/etc

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

Done.

+    downloading_cb_.Run(loader_->is_downloading_data());
+
   int64 current_buffered_position = loader_->GetBufferedPosition();
 
   // If we get an unspecified value, return immediately.
@@ -568,12 +571,6 @@ void BufferedDataSource::NetworkEventCallback() {
   if (stop_signal_received_)
     return;
 
-  if (is_downloading_data != is_downloading_data_) {
-    is_downloading_data_ = is_downloading_data;
-    if (host())
-      host()->SetNetworkActivity(is_downloading_data);
-  }
-
   int64 start = loader_->first_byte_position();
   if (host() && current_buffered_position > start)
     host()->AddBufferedByteRange(start, current_buffered_position);