Split a portion of BufferedResourceLoader into a separate class ActiveLoader.

webkit/media/buffered_data_source_unittest.cc

 // Copyright (c) 2011 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 "media/base/media_log.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/media/buffered_data_source.h"
 #include "webkit/media/response_generator.h"
 #include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
 using ::testing::Assign;
 using ::testing::Invoke;
-using ::testing::Mock;
 using ::testing::StrictMock;
 using ::testing::NiceMock;
 
 using WebKit::WebFrame;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
 using webkit_glue::MockWebFrameClient;
 using webkit_glue::MockWebURLLoader;
 
@@ skipping 17 matching lines @@
         BufferedDataSource::CreateResourceLoader(first_byte_position,
                                                  last_byte_position);
 
     // Keep track of active loading state via loadAsynchronously() and cancel().
     NiceMock<MockWebURLLoader>* url_loader = new NiceMock<MockWebURLLoader>();
     ON_CALL(*url_loader, loadAsynchronously(_, _))
         .WillByDefault(Assign(&loading_, true));
     ON_CALL(*url_loader, cancel())
         .WillByDefault(Assign(&loading_, false));
 
-    // TODO(scherkus): this is a real leak detected by http://crbug.com/100914
-    // but the fix will have to wait for a more invasive follow up patch.
-    //
-    // If you're curious what the fix is, we no longer need the reference
-    // counting added to BufferedResourceLoader in r23274 since we started
-    // using WebURLLoader in r69429.
-    Mock::AllowLeak(url_loader);
-
     loader->SetURLLoaderForTest(url_loader);
     return loader;
   }
 
   bool loading() { return loading_; }
   void set_loading(bool loading) { loading_ = loading; }
 
  private:
   // Whether the resource load has starting loading but yet to been cancelled.
   bool loading_;
@@ skipping 90 matching lines @@
                                   base::Unretained(this)));
     message_loop_->RunAllPending();
   }
 
   // Accessors for private variables on |data_source_|.
   BufferedResourceLoader* loader() {
     return data_source_->loader_.get();
   }
   NiceMock<MockWebURLLoader>* url_loader() {
     return static_cast<NiceMock<MockWebURLLoader>*>(
-        loader()->url_loader_.get());
+        loader()->active_loader_->loader_.get());
   }
 
   media::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_; }
@@ skipping 191 matching lines @@
 
   // Read so far ahead to cause the loader to get recreated.
   BufferedResourceLoader* old_loader = loader();
   ExpectCreateResourceLoader();
   ReadAtWithError(4000000);
   Respond(responses_.Generate206(4000000));
 
   // Verify loader changed but still has same bitrate.
   EXPECT_NE(old_loader, loader());
   EXPECT_EQ(1234, loader_bitrate());
+
+  // During teardown we'll also report our final network status.
+  EXPECT_CALL(host_, SetBufferedBytes(4000000));
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, SetPlaybackRate) {
   InitializeWith206Response();
 
   data_source_->SetPlaybackRate(2.0f);
   message_loop_->RunAllPending();
   EXPECT_EQ(2.0f, data_source_playback_rate());
   EXPECT_EQ(2.0f, loader_playback_rate());
 
   // Read so far ahead to cause the loader to get recreated.
   BufferedResourceLoader* old_loader = loader();
   ExpectCreateResourceLoader();
   ReadAtWithError(4000000);
   Respond(responses_.Generate206(4000000));
 
   // Verify loader changed but still has same bitrate.
   EXPECT_NE(old_loader, loader());
+
+  // During teardown we'll also report our final network status.
+  EXPECT_CALL(host_, SetBufferedBytes(4000000));
   Stop();
 }
 
 TEST_F(BufferedDataSourceTest, Read) {
   InitializeWith206Response();
 
   ReadAt(0);
 
   // When the read completes we'll update our network status.
   EXPECT_CALL(host_, SetBufferedBytes(1024));
   EXPECT_CALL(host_, SetNetworkActivity(true));
   FinishRead();
 
   // During teardown we'll also report our final network status.
   EXPECT_CALL(host_, SetBufferedBytes(1024));
   EXPECT_CALL(host_, SetNetworkActivity(false));
   Stop();
 }
 
 }  // namespace webkit_media