Rename WebURLLoaderClient::willSendRequest to willFollowRedirect

This client method is invoked to do something before handling redirect.
It should be named to indicate that.

BUG=none
R=kinuko,mkwst,wolenetz

Review URL: https://codereview.chromium.org/1367673004

Cr-Commit-Position: refs/heads/master@{#352531}

19 files changed, 53 insertions, 51 deletions

diff --git a/components/html_viewer/web_url_loader_impl.cc b/components/html_viewer/web_url_loader_impl.cc
index 05c60da..ecffee8 100644
--- a/components/html_viewer/web_url_loader_impl.cc
+++ b/components/html_viewer/web_url_loader_impl.cc
@@ -252,10 +252,11 @@ void WebURLLoaderImpl::OnReceivedRedirect(const blink::WebURLRequest& request,
     new_request.setHTTPBody(request.httpBody());
 
   base::WeakPtr<WebURLLoaderImpl> self(weak_factory_.GetWeakPtr());
-  client_->willSendRequest(this, new_request, ToWebURLResponse(url_response));
+  client_->willFollowRedirect(
+      this, new_request, ToWebURLResponse(url_response));
   // TODO(darin): Check if new_request was rejected.
 
-  // We may have been deleted during willSendRequest.
+  // We may have been deleted during willFollowRedirect.
   if (!self)
     return;
 
diff --git a/content/child/multipart_response_delegate_unittest.cc b/content/child/multipart_response_delegate_unittest.cc
index ab2bbae..38e8390 100644
--- a/content/child/multipart_response_delegate_unittest.cc
+++ b/content/child/multipart_response_delegate_unittest.cc
@@ -51,9 +51,9 @@ class MockWebURLLoaderClient : public WebURLLoaderClient {
  public:
   MockWebURLLoaderClient() { Reset(); }
 
-  void willSendRequest(WebURLLoader*,
-                       WebURLRequest&,
-                       const WebURLResponse&) override {}
+  void willFollowRedirect(WebURLLoader*,
+                          WebURLRequest&,
+                          const WebURLResponse&) override {}
   void didSendData(WebURLLoader*,
                    unsigned long long,
                    unsigned long long) override {}
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 83c9ad5..bf669cc 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -518,10 +518,10 @@ bool WebURLLoaderImpl::Context::OnReceivedRedirect(
                                 !info.was_fetched_via_service_worker,
                                 &new_request);
 
-  // Protect from deletion during call to willSendRequest.
+  // Protect from deletion during call to willFollowRedirect.
   scoped_refptr<Context> protect(this);
 
-  client_->willSendRequest(loader_, new_request, response);
+  client_->willFollowRedirect(loader_, new_request, response);
   request_ = new_request;
 
   // Only follow the redirect if WebKit left the URL unmodified.
diff --git a/content/child/web_url_loader_impl_unittest.cc b/content/child/web_url_loader_impl_unittest.cc
index 1d98b3f..6fb686e 100644
--- a/content/child/web_url_loader_impl_unittest.cc
+++ b/content/child/web_url_loader_impl_unittest.cc
@@ -120,7 +120,7 @@ class TestWebURLLoaderClient : public blink::WebURLLoaderClient {
   ~TestWebURLLoaderClient() override {}
 
   // blink::WebURLLoaderClient implementation:
-  void willSendRequest(
+  void willFollowRedirect(
       blink::WebURLLoader* loader,
       blink::WebURLRequest& newRequest,
       const blink::WebURLResponse& redirectResponse) override {
diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc
index 32e3552..c611daa 100644
--- a/content/renderer/npapi/webplugin_impl.cc
+++ b/content/renderer/npapi/webplugin_impl.cc
@@ -101,9 +101,9 @@ class MultiPartResponseClient : public WebURLLoaderClient {
   explicit MultiPartResponseClient(WebPluginResourceClient* resource_client)
       : byte_range_lower_bound_(0), resource_client_(resource_client) {}
 
-  void willSendRequest(WebURLLoader*,
-                       WebURLRequest&,
-                       const WebURLResponse&) override {}
+  void willFollowRedirect(WebURLLoader*,
+                          WebURLRequest&,
+                          const WebURLResponse&) override {}
   void didSendData(WebURLLoader*,
                    unsigned long long,
                    unsigned long long) override {}
@@ -491,10 +491,10 @@ bool WebPluginImpl::isPlaceholder() {
 WebPluginImpl::LoaderClient::LoaderClient(WebPluginImpl* parent)
     : parent_(parent) {}
 
-void WebPluginImpl::LoaderClient::willSendRequest(
-    blink::WebURLLoader* loader, blink::WebURLRequest& newRequest,
-    const blink::WebURLResponse& redirectResponse) {
-  parent_->willSendRequest(loader, newRequest, redirectResponse);
+void WebPluginImpl::LoaderClient::willFollowRedirect(
+    blink::WebURLLoader* loader, blink::WebURLRequest& new_request,
+    const blink::WebURLResponse& redirect_response) {
+  parent_->willFollowRedirect(loader, new_request, redirect_response);
 }
 
 void WebPluginImpl::LoaderClient::didSendData(
@@ -921,9 +921,9 @@ WebPluginImpl::ClientInfo* WebPluginImpl::GetClientInfoFromLoader(
   return 0;
 }
 
-void WebPluginImpl::willSendRequest(WebURLLoader* loader,
-                                    WebURLRequest& request,
-                                    const WebURLResponse& response) {
+void WebPluginImpl::willFollowRedirect(WebURLLoader* loader,
+                                       WebURLRequest& new_request,
+                                       const WebURLResponse& response) {
   // TODO(jam): THIS LOGIC IS COPIED IN PluginURLFetcher::OnReceivedRedirect
   // until kDirectNPAPIRequests is the default and we can remove this old path.
   WebPluginImpl::ClientInfo* client_info = GetClientInfoFromLoader(loader);
@@ -934,7 +934,7 @@ void WebPluginImpl::willSendRequest(WebURLLoader* loader,
     // initiated by plugins.
     if (client_info->is_plugin_src_load &&
         webframe_ &&
-        !webframe_->checkIfRunInsecureContent(request.url())) {
+        !webframe_->checkIfRunInsecureContent(new_request.url())) {
       loader->cancel();
       client_info->client->DidFail(client_info->id);
       return;
@@ -945,9 +945,10 @@ void WebPluginImpl::willSendRequest(WebURLLoader* loader,
       // just block cross origin 307 POST redirects.
       if (!client_info->notify_redirects) {
         if (response.httpStatusCode() == 307 &&
-            base::LowerCaseEqualsASCII(request.httpMethod().utf8(), "post")) {
+            base::LowerCaseEqualsASCII(
+                new_request.httpMethod().utf8(), "post")) {
           GURL original_request_url(response.url());
-          GURL response_url(request.url());
+          GURL response_url(new_request.url());
           if (original_request_url.GetOrigin() != response_url.GetOrigin()) {
             loader->setDefersLoading(true);
             loader->cancel();
@@ -959,7 +960,7 @@ void WebPluginImpl::willSendRequest(WebURLLoader* loader,
         loader->setDefersLoading(true);
       }
     }
-    client_info->client->WillSendRequest(request.url(),
+    client_info->client->WillSendRequest(new_request.url(),
                                          response.httpStatusCode());
   }
 }
diff --git a/content/renderer/npapi/webplugin_impl.h b/content/renderer/npapi/webplugin_impl.h
index 517157f..75bc0ff4 100644
--- a/content/renderer/npapi/webplugin_impl.h
+++ b/content/renderer/npapi/webplugin_impl.h
@@ -207,9 +207,9 @@ class WebPluginImpl : public WebPlugin,
   // WebURLLoaderClient implementation.  We implement this interface in the
   // renderer process, and then use the simple WebPluginResourceClient interface
   // to relay the callbacks to the plugin.
-  void willSendRequest(blink::WebURLLoader* loader,
-                       blink::WebURLRequest& request,
-                       const blink::WebURLResponse& response);
+  void willFollowRedirect(blink::WebURLLoader* loader,
+                          blink::WebURLRequest& new_request,
+                          const blink::WebURLResponse& response);
   void didSendData(blink::WebURLLoader* loader,
                    unsigned long long bytes_sent,
                    unsigned long long total_bytes_to_be_sent);
@@ -329,9 +329,9 @@ class WebPluginImpl : public WebPlugin,
    public:
     LoaderClient(WebPluginImpl*);
 
-    void willSendRequest(blink::WebURLLoader*,
-                         blink::WebURLRequest&,
-                         const blink::WebURLResponse&) override;
+    void willFollowRedirect(blink::WebURLLoader*,
+                            blink::WebURLRequest&,
+                            const blink::WebURLResponse&) override;
     void didSendData(blink::WebURLLoader*,
                      unsigned long long bytesSent,
                      unsigned long long totalBytesToBeSent) override;
diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc
index 637125b..5b08f0a 100644
--- a/content/renderer/pepper/pepper_url_loader_host.cc
+++ b/content/renderer/pepper/pepper_url_loader_host.cc
@@ -118,7 +118,7 @@ int32_t PepperURLLoaderHost::OnResourceMessageReceived(
   return PP_ERROR_FAILED;
 }
 
-void PepperURLLoaderHost::willSendRequest(
+void PepperURLLoaderHost::willFollowRedirect(
     WebURLLoader* loader,
     WebURLRequest& new_request,
     const WebURLResponse& redirect_response) {
diff --git a/content/renderer/pepper/pepper_url_loader_host.h b/content/renderer/pepper/pepper_url_loader_host.h
index 7d09452..8ea3c2e 100644
--- a/content/renderer/pepper/pepper_url_loader_host.h
+++ b/content/renderer/pepper/pepper_url_loader_host.h
@@ -42,9 +42,9 @@ class PepperURLLoaderHost : public ppapi::host::ResourceHost,
       ppapi::host::HostMessageContext* context) override;
 
   // blink::WebURLLoaderClient implementation.
-  void willSendRequest(blink::WebURLLoader* loader,
-                       blink::WebURLRequest& new_request,
-                       const blink::WebURLResponse& redir_response) override;
+  void willFollowRedirect(blink::WebURLLoader* loader,
+                          blink::WebURLRequest& new_request,
+                          const blink::WebURLResponse& redir_response) override;
   void didSendData(blink::WebURLLoader* loader,
                    unsigned long long bytes_sent,
                    unsigned long long total_bytes_to_be_sent) override;
diff --git a/content/test/weburl_loader_mock.cc b/content/test/weburl_loader_mock.cc
index 30826fb..b7f29e4 100644
--- a/content/test/weburl_loader_mock.cc
+++ b/content/test/weburl_loader_mock.cc
@@ -84,9 +84,9 @@ blink::WebURLRequest WebURLLoaderMock::ServeRedirect(
 
   base::WeakPtr<WebURLLoaderMock> self(weak_factory_.GetWeakPtr());
 
-  client_->willSendRequest(this, newRequest, redirectResponse);
+  client_->willFollowRedirect(this, newRequest, redirectResponse);
 
-  // |this| might be deleted in willSendRequest().
+  // |this| might be deleted in willFollowRedirect().
   if (!self)
     return newRequest;
 
diff --git a/media/blink/buffered_resource_loader.cc b/media/blink/buffered_resource_loader.cc
index 8f276de..5e2a36b 100644
--- a/media/blink/buffered_resource_loader.cc
+++ b/media/blink/buffered_resource_loader.cc
@@ -326,7 +326,7 @@ bool BufferedResourceLoader::range_supported() {
 
 /////////////////////////////////////////////////////////////////////////////
 // blink::WebURLLoaderClient implementation.
-void BufferedResourceLoader::willSendRequest(
+void BufferedResourceLoader::willFollowRedirect(
     WebURLLoader* loader,
     WebURLRequest& newRequest,
     const WebURLResponse& redirectResponse) {
diff --git a/media/blink/buffered_resource_loader.h b/media/blink/buffered_resource_loader.h
index e14100b..a458b4d 100644
--- a/media/blink/buffered_resource_loader.h
+++ b/media/blink/buffered_resource_loader.h
@@ -132,7 +132,7 @@ class MEDIA_EXPORT BufferedResourceLoader
   bool range_supported();
 
   // blink::WebURLLoaderClient implementation.
-  void willSendRequest(
+  void willFollowRedirect(
       blink::WebURLLoader* loader,
       blink::WebURLRequest& newRequest,
       const blink::WebURLResponse& redirectResponse) override;
diff --git a/media/blink/buffered_resource_loader_unittest.cc b/media/blink/buffered_resource_loader_unittest.cc
index 5a15f71..096f7bf 100644
--- a/media/blink/buffered_resource_loader_unittest.cc
+++ b/media/blink/buffered_resource_loader_unittest.cc
@@ -194,7 +194,7 @@ class BufferedResourceLoaderTest : public testing::Test {
     blink::WebURLRequest newRequest(redirectUrl);
     blink::WebURLResponse redirectResponse(gurl_);
 
-    loader_->willSendRequest(url_loader_, newRequest, redirectResponse);
+    loader_->willFollowRedirect(url_loader_, newRequest, redirectResponse);
 
     base::MessageLoop::current()->RunUntilIdle();
   }
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
index be3969e..800e826 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
@@ -264,7 +264,7 @@ void ResourceLoader::cancel(const ResourceError& error)
         releaseResources();
 }
 
-void ResourceLoader::willSendRequest(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse)
+void ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse)
 {
     ASSERT(m_state != Terminated);
 
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.h b/third_party/WebKit/Source/core/fetch/ResourceLoader.h
index 9fb2b1f..4712255a 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.h
+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.h
@@ -72,7 +72,7 @@ public:
     bool shouldUseIncreasedPriorities();
 
     // WebURLLoaderClient
-    void willSendRequest(WebURLLoader*, WebURLRequest&, const WebURLResponse& redirectResponse) override;
+    void willFollowRedirect(WebURLLoader*, WebURLRequest&, const WebURLResponse& redirectResponse) override;
     void didSendData(WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
     void didReceiveResponse(WebURLLoader*, const WebURLResponse&) override;
     void didReceiveResponse(WebURLLoader*, const WebURLResponse&, WebDataConsumerHandle*) override;
diff --git a/third_party/WebKit/Source/core/loader/BeaconLoader.cpp b/third_party/WebKit/Source/core/loader/BeaconLoader.cpp
index 3bd9e20..025b1ce 100644
--- a/third_party/WebKit/Source/core/loader/BeaconLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/BeaconLoader.cpp
@@ -135,7 +135,7 @@ BeaconLoader::BeaconLoader(LocalFrame* frame, ResourceRequest& request, const Fe
 {
 }
 
-void BeaconLoader::willSendRequest(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse)
+void BeaconLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse)
 {
     passedNewRequest.setAllowStoredCredentials(true);
     ResourceRequest& newRequest(passedNewRequest.toMutableResourceRequest());
diff --git a/third_party/WebKit/Source/core/loader/BeaconLoader.h b/third_party/WebKit/Source/core/loader/BeaconLoader.h
index 6d1cd63..389c188 100644
--- a/third_party/WebKit/Source/core/loader/BeaconLoader.h
+++ b/third_party/WebKit/Source/core/loader/BeaconLoader.h
@@ -42,7 +42,7 @@ private:
     RefPtr<SecurityOrigin> m_beaconOrigin;
 
     // WebURLLoaderClient
-    void willSendRequest(WebURLLoader*, WebURLRequest&, const WebURLResponse&) override;
+    void willFollowRedirect(WebURLLoader*, WebURLRequest&, const WebURLResponse&) override;
 };
 
 } // namespace blink
diff --git a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
index bd33455..6170c8d 100644
--- a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
+++ b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
@@ -183,7 +183,7 @@ void AssociatedURLLoader::ClientAdapter::willFollowRedirect(ResourceRequest& new
 
     WrappedResourceRequest wrappedNewRequest(newRequest);
     WrappedResourceResponse wrappedRedirectResponse(redirectResponse);
-    m_client->willSendRequest(m_loader, wrappedNewRequest, wrappedRedirectResponse);
+    m_client->willFollowRedirect(m_loader, wrappedNewRequest, wrappedRedirectResponse);
 }
 
 void AssociatedURLLoader::ClientAdapter::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
diff --git a/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp b/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp
index 07000f3..03c6845 100644
--- a/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp
+++ b/third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp
@@ -58,7 +58,7 @@ class AssociatedURLLoaderTest : public ::testing::Test,
                                 public WebURLLoaderClient {
 public:
     AssociatedURLLoaderTest()
-        :  m_willSendRequest(false)
+        :  m_willFollowRedirect(false)
         ,  m_didSendData(false)
         ,  m_didReceiveResponse(false)
         ,  m_didReceiveData(false)
@@ -121,9 +121,9 @@ public:
     }
 
     // WebURLLoaderClient implementation.
-    void willSendRequest(WebURLLoader* loader, WebURLRequest& newRequest, const WebURLResponse& redirectResponse) override
+    void willFollowRedirect(WebURLLoader* loader, WebURLRequest& newRequest, const WebURLResponse& redirectResponse) override
     {
-        m_willSendRequest = true;
+        m_willFollowRedirect = true;
         EXPECT_EQ(m_expectedLoader, loader);
         EXPECT_EQ(m_expectedNewRequest.url(), newRequest.url());
         // Check that CORS simple headers are transferred to the new request.
@@ -273,7 +273,7 @@ protected:
     WebURLResponse m_expectedResponse;
     WebURLRequest m_expectedNewRequest;
     WebURLResponse m_expectedRedirectResponse;
-    bool m_willSendRequest;
+    bool m_willFollowRedirect;
     bool m_didSendData;
     bool m_didReceiveResponse;
     bool m_didDownloadData;
@@ -465,7 +465,7 @@ TEST_F(AssociatedURLLoaderTest, RedirectSuccess)
     EXPECT_TRUE(m_expectedLoader);
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
-    EXPECT_TRUE(m_willSendRequest);
+    EXPECT_TRUE(m_willFollowRedirect);
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
@@ -504,7 +504,7 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginFailure)
     m_expectedLoader->loadAsynchronously(request, this);
 
     serveRequests();
-    EXPECT_FALSE(m_willSendRequest);
+    EXPECT_FALSE(m_willFollowRedirect);
     EXPECT_FALSE(m_didReceiveResponse);
     EXPECT_FALSE(m_didReceiveData);
     EXPECT_FALSE(m_didFinishLoading);
@@ -546,7 +546,7 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlFailure)
 
     serveRequests();
     // We should get a notification about access control check failure.
-    EXPECT_FALSE(m_willSendRequest);
+    EXPECT_FALSE(m_willFollowRedirect);
     EXPECT_FALSE(m_didReceiveResponse);
     EXPECT_FALSE(m_didReceiveData);
     EXPECT_TRUE(m_didFail);
@@ -593,7 +593,7 @@ TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlSuccess)
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     // We should not receive a notification for the redirect.
-    EXPECT_FALSE(m_willSendRequest);
+    EXPECT_FALSE(m_willFollowRedirect);
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
diff --git a/third_party/WebKit/public/platform/WebURLLoaderClient.h b/third_party/WebKit/public/platform/WebURLLoaderClient.h
index 8454b78..41b7bee 100644
--- a/third_party/WebKit/public/platform/WebURLLoaderClient.h
+++ b/third_party/WebKit/public/platform/WebURLLoaderClient.h
@@ -45,7 +45,7 @@ class BLINK_PLATFORM_EXPORT WebURLLoaderClient {
 public:
     // Called when following a redirect. |newRequest| contains the request
     // generated by the redirect. The client may modify |newRequest|.
-    virtual void willSendRequest(
+    virtual void willFollowRedirect(
         WebURLLoader*, WebURLRequest& newRequest, const WebURLResponse& redirectResponse) { }
 
     // Called to report upload progress. The bytes reported correspond to