AssociatedURLLoader shouldn't derive from WebURLLoader

media/blink/multibuffer_data_source_unittest.cc

Index: media/blink/multibuffer_data_source_unittest.cc
diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc
index 70ab655283ac1331540570542c6132f373912c87..c44edce39a67d9fad2b799c304c90f7cb0077869 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -14,7 +14,7 @@
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "media/blink/buffered_data_source_host_impl.h"
-#include "media/blink/mock_weburlloader.h"
+#include "media/blink/mock_webassociatedurlloader.h"
 #include "media/blink/multibuffer_data_source.h"
 #include "media/blink/multibuffer_reader.h"
 #include "media/blink/resource_multibuffer_data_provider.h"
@@ -33,9 +33,9 @@ using ::testing::InSequence;
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 
+using blink::WebAssociatedURLLoader;
 using blink::WebLocalFrame;
 using blink::WebString;
-using blink::WebURLLoader;
 using blink::WebURLResponse;
 using blink::WebView;
 
@@ -58,7 +58,8 @@ class TestMultiBufferDataProvider : public ResourceMultiBufferDataProvider {
   void Start() override {
     // Create a mock active loader.
     // Keep track of active loading state via loadAsynchronously() and cancel().
-    NiceMock<MockWebURLLoader>* url_loader = new NiceMock<MockWebURLLoader>();
+    NiceMock<MockWebAssociatedURLLoader>* url_loader =
+        new NiceMock<MockWebAssociatedURLLoader>();
     ON_CALL(*url_loader, cancel())
         .WillByDefault(Invoke([this]() {
           // Check that we have not been destroyed first.
@@ -68,7 +69,7 @@ class TestMultiBufferDataProvider : public ResourceMultiBufferDataProvider {
         }));
     loading_ = true;
     active_loader_.reset(
-        new ActiveLoader(std::unique_ptr<WebURLLoader>(url_loader)));
+        new ActiveLoader(std::unique_ptr<WebAssociatedURLLoader>(url_loader)));
     if (!on_start_.is_null()) {
       on_start_.Run();
     }
@@ -299,8 +300,7 @@ class MultibufferDataSourceTest : public testing::Test {
   // appropriate to do when tearing down a test.
   void Stop() {
     if (loading()) {
-      data_provider()->didFail(url_loader(),
-                               response_generator_->GenerateError());
+      data_provider()->didFail(response_generator_->GenerateError());
       base::RunLoop().RunUntilIdle();
     }
 
@@ -312,7 +312,7 @@ class MultibufferDataSourceTest : public testing::Test {
     EXPECT_TRUE(url_loader());
     if (!active_loader())
       return;
-    data_provider()->didReceiveResponse(url_loader(), response);
+    data_provider()->didReceiveResponse(response);
     base::RunLoop().RunUntilIdle();
   }
 
@@ -323,7 +323,7 @@ class MultibufferDataSourceTest : public testing::Test {
     std::unique_ptr<char[]> data(new char[size]);
     memset(data.get(), 0xA5, size);  // Arbitrary non-zero value.
 
-    data_provider()->didReceiveData(url_loader(), data.get(), size, size, size);
+    data_provider()->didReceiveData(data.get(), size);
   }
 
   void ReceiveData(int size) {
@@ -335,13 +335,12 @@ class MultibufferDataSourceTest : public testing::Test {
     EXPECT_TRUE(url_loader());
     if (!url_loader())
       return;
-    data_provider()->didFinishLoading(url_loader(), 0, -1);
+    data_provider()->didFinishLoading(0);
     base::RunLoop().RunUntilIdle();
   }
 
   void FailLoading() {
-    data_provider()->didFail(url_loader(),
-                             response_generator_->GenerateError());
+    data_provider()->didFail(response_generator_->GenerateError());
     base::RunLoop().RunUntilIdle();
   }
 
@@ -445,7 +444,7 @@ class MultibufferDataSourceTest : public testing::Test {
       return nullptr;
     return data_provider->active_loader_.get();
   }
-  WebURLLoader* url_loader() {
+  WebAssociatedURLLoader* url_loader() {
     EXPECT_TRUE(active_loader());
     if (!active_loader())
       return nullptr;
@@ -672,7 +671,7 @@ TEST_F(MultibufferDataSourceTest, Http_RetryOnError) {
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 2));
   ReadAt(kDataSize);
   base::RunLoop run_loop;
-  data_provider()->didFail(url_loader(), response_generator_->GenerateError());
+  data_provider()->didFail(response_generator_->GenerateError());
   data_provider()->RunOnStart(run_loop.QuitClosure());
   run_loop.Run();
   Respond(response_generator_->Generate206(kDataSize));
@@ -1379,7 +1378,7 @@ TEST_F(MultibufferDataSourceTest, Http_RetryThenRedirect) {
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 2));
   ReadAt(kDataSize + 10, kDataSize - 10);
   base::RunLoop run_loop;
-  data_provider()->didFail(url_loader(), response_generator_->GenerateError());
+  data_provider()->didFail(response_generator_->GenerateError());
   data_provider()->RunOnStart(run_loop.QuitClosure());
   run_loop.Run();
 
@@ -1387,7 +1386,7 @@ TEST_F(MultibufferDataSourceTest, Http_RetryThenRedirect) {
   blink::WebURLRequest request((GURL(kHttpDifferentPathUrl)));
   blink::WebURLResponse response((GURL(kHttpUrl)));
   response.setHTTPStatusCode(307);
-  data_provider()->willFollowRedirect(url_loader(), request, response);
+  data_provider()->willFollowRedirect(request, response);
   Respond(response_generator_->Generate206(kDataSize));
   ReceiveData(kDataSize);
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 3));
@@ -1403,7 +1402,7 @@ TEST_F(MultibufferDataSourceTest, Http_NotStreamingAfterRedirect) {
   blink::WebURLRequest request((GURL(kHttpDifferentPathUrl)));
   blink::WebURLResponse response((GURL(kHttpUrl)));
   response.setHTTPStatusCode(307);
-  data_provider()->willFollowRedirect(url_loader(), request, response);
+  data_provider()->willFollowRedirect(request, response);
 
   EXPECT_CALL(host_, SetTotalBytes(response_generator_->content_length()));
   Respond(response_generator_->Generate206(0));
@@ -1425,7 +1424,7 @@ TEST_F(MultibufferDataSourceTest, Http_RangeNotSatisfiableAfterRedirect) {
   blink::WebURLRequest request((GURL(kHttpDifferentPathUrl)));
   blink::WebURLResponse response((GURL(kHttpUrl)));
   response.setHTTPStatusCode(307);
-  data_provider()->willFollowRedirect(url_loader(), request, response);
+  data_provider()->willFollowRedirect(request, response);
 
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize));
   Respond(response_generator_->GenerateResponse(416));