AssociatedURLLoader shouldn't derive from WebURLLoader

content/renderer/media/android/media_info_loader_unittest.cc

Index: content/renderer/media/android/media_info_loader_unittest.cc
diff --git a/content/renderer/media/android/media_info_loader_unittest.cc b/content/renderer/media/android/media_info_loader_unittest.cc
index 5f3d7974a3ad50dfcf1cc22a22be5bc32098fdf5..59fa38ef90b599ba6f1dd7da5a4f7c51f50185cb 100644
--- a/content/renderer/media/android/media_info_loader_unittest.cc
+++ b/content/renderer/media/android/media_info_loader_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/renderer/media/android/media_info_loader.h"
-#include "content/test/mock_weburlloader.h"
+#include "content/test/mock_webassociatedurlloader.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
@@ -60,8 +60,9 @@ class MediaInfoLoaderTest : public testing::Test {
                    base::Unretained(this))));
 
     // |test_loader_| will be used when Start() is called.
-    url_loader_ = new NiceMock<MockWebURLLoader>();
-    loader_->test_loader_ = std::unique_ptr<blink::WebURLLoader>(url_loader_);
+    url_loader_ = new NiceMock<MockWebAssociatedURLLoader>();
+    loader_->test_loader_ =
+        std::unique_ptr<blink::WebAssociatedURLLoader>(url_loader_);
   }
 
   void Start() {
@@ -81,7 +82,7 @@ class MediaInfoLoaderTest : public testing::Test {
     blink::WebURLRequest new_request(redirect_url);
     blink::WebURLResponse redirect_response(gurl_);
 
-    loader_->willFollowRedirect(url_loader_, new_request, redirect_response);
+    loader_->willFollowRedirect(new_request, redirect_response);
 
     base::RunLoop().RunUntilIdle();
   }
@@ -96,13 +97,13 @@ class MediaInfoLoaderTest : public testing::Test {
                                 WebString::fromUTF8("0"));
     response.setExpectedContentLength(0);
     response.setHTTPStatusCode(http_status);
-    loader_->didReceiveResponse(url_loader_, response);
+    loader_->didReceiveResponse(response);
   }
 
   void FailLoad() {
     EXPECT_CALL(*this, ReadyCallback(
         MediaInfoLoader::kFailed, _, _, _));
-    loader_->didFail(url_loader_, WebURLError());
+    loader_->didFail(WebURLError());
   }
 
   MOCK_METHOD4(ReadyCallback,
@@ -112,7 +113,7 @@ class MediaInfoLoaderTest : public testing::Test {
   GURL gurl_;
 
   std::unique_ptr<MediaInfoLoader> loader_;
-  NiceMock<MockWebURLLoader>* url_loader_;
+  NiceMock<MockWebAssociatedURLLoader>* url_loader_;
 
   blink::WebFrameClient client_;
   WebView* view_;