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

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"
@@ skipping 19 matching lines @@
 using webkit_glue::MockWebFrameClient;
 using webkit_glue::MockWebURLLoader;
 
 namespace webkit_media {
 
 // Overrides CreateResourceLoader() to permit injecting a MockWebURLLoader.
 // Also keeps track of whether said MockWebURLLoader is actively loading.
 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) {
   }
 
   MOCK_METHOD2(CreateResourceLoader, BufferedResourceLoader*(int64, int64));
   BufferedResourceLoader* CreateMockResourceLoader(int64 first_byte_position,
                                                    int64 last_byte_position) {
     CHECK(!loading_) << "Previous resource load wasn't cancelled";
 
     BufferedResourceLoader* loader =
         BufferedDataSource::CreateResourceLoader(first_byte_position,
@@ skipping 115 matching lines @@
 
   Preload preload() { return data_source_->preload_; }
   BufferedResourceLoader::DeferStrategy defer_strategy() {
     return loader()->defer_strategy_;
   }
   int data_source_bitrate() { return data_source_->bitrate_; }
   int data_source_playback_rate() { return data_source_->playback_rate_; }
   int loader_bitrate() { return loader()->bitrate_; }
   int loader_playback_rate() { return loader()->playback_rate_; }
 
-
   scoped_refptr<MockBufferedDataSource> data_source_;
 
   TestResponseGenerator response_generator_;
   MockWebFrameClient client_;
   WebView* view_;
 
   StrictMock<media::MockDataSourceHost> host_;
   MessageLoop message_loop_;
 
  private:
@@ skipping 238 matching lines @@
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Read) {
   InitializeWith206Response();
 
   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();
+  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