AssociatedURLLoader shouldn't derive from WebURLLoader

content/renderer/media/android/media_info_loader_unittest.cc

 // Copyright 2013 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/macros.h"
 #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"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using ::testing::_;
 using ::testing::InSequence;
@@ skipping 32 matching lines @@
       const char* url,
       blink::WebMediaPlayer::CORSMode cors_mode) {
     gurl_ = GURL(url);
 
     loader_.reset(new MediaInfoLoader(
         gurl_, cors_mode,
         base::Bind(&MediaInfoLoaderTest::ReadyCallback,
                    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() {
     InSequence s;
     EXPECT_CALL(*url_loader_, loadAsynchronously(_, _));
     loader_->Start(view_->mainFrame());
   }
 
   void Stop() {
     InSequence s;
     EXPECT_CALL(*url_loader_, cancel());
     loader_.reset();
   }
 
   void Redirect(const char* url) {
     GURL redirect_url(url);
     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();
   }
 
   void SendResponse(
       int http_status, MediaInfoLoader::Status expected_status) {
     EXPECT_CALL(*this, ReadyCallback(expected_status, _, _, _));
     EXPECT_CALL(*url_loader_, cancel());
 
     WebURLResponse response(gurl_);
     response.setHTTPHeaderField(WebString::fromUTF8("Content-Length"),
                                 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,
                void(MediaInfoLoader::Status, const GURL&, const GURL&, bool));
 
  protected:
   GURL gurl_;
 
   std::unique_ptr<MediaInfoLoader> loader_;
-  NiceMock<MockWebURLLoader>* url_loader_;
+  NiceMock<MockWebAssociatedURLLoader>* url_loader_;
 
   blink::WebFrameClient client_;
   WebView* view_;
 
   base::MessageLoop message_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaInfoLoaderTest);
 };
 
@@ skipping 69 matching lines @@
 }
 
 TEST_F(MediaInfoLoaderTest, CORSAccessCheckFailed) {
   Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUseCredentials);
   Start();
   SendResponse(kHttpNotFound, MediaInfoLoader::kFailed);
   EXPECT_FALSE(loader_->DidPassCORSAccessCheck());
 }
 
 }  // namespace content