Change WebURLLoaderClient::willFollowRedirect() API to return bool

third_party/WebKit/Source/web/AssociatedURLLoader.cpp

 /*
  * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 87 matching lines @@
   void didReceiveResponse(unsigned long,
                           const ResourceResponse&,
                           std::unique_ptr<WebDataConsumerHandle>) override;
   void didDownloadData(int /*dataLength*/) override;
   void didReceiveData(const char*, unsigned /*dataLength*/) override;
   void didReceiveCachedMetadata(const char*, int /*dataLength*/) override;
   void didFinishLoading(unsigned long /*identifier*/,
                         double /*finishTime*/) override;
   void didFail(const ResourceError&) override;
   void didFailRedirectCheck() override;
+
   // DocumentThreadableLoaderClient
-  void willFollowRedirect(
-      ResourceRequest& /*newRequest*/,
+  bool willFollowRedirect(
+      const ResourceRequest& /*newRequest*/,
       const ResourceResponse& /*redirectResponse*/) override;
 
   // Sets an error to be reported back to the client, asychronously.
   void setDelayedError(const ResourceError&);
 
   // Enables forwarding of error notifications to the WebURLLoaderClient. These
   // must be deferred until after the call to
   // AssociatedURLLoader::loadAsynchronously() completes.
   void enableErrorNotifications();
 
@@ skipping 36 matching lines @@
     : m_loader(loader),
       m_client(client),
       m_options(options),
       m_errorTimer(this, &ClientAdapter::notifyError),
       m_enableErrorNotifications(false),
       m_didFail(false) {
   DCHECK(m_loader);
   DCHECK(m_client);
 }
 
-void AssociatedURLLoader::ClientAdapter::willFollowRedirect(
-    ResourceRequest& newRequest,
+bool AssociatedURLLoader::ClientAdapter::willFollowRedirect(
+    const ResourceRequest& newRequest,
     const ResourceResponse& redirectResponse) {
   if (!m_client)
-    return;
+    return true;
 
   WrappedResourceRequest wrappedNewRequest(newRequest);
   WrappedResourceResponse wrappedRedirectResponse(redirectResponse);
-  m_client->willFollowRedirect(m_loader, wrappedNewRequest,
-                               wrappedRedirectResponse);
+  return m_client->willFollowRedirect(m_loader, wrappedNewRequest,
+                                      wrappedRedirectResponse);
 }
 
 void AssociatedURLLoader::ClientAdapter::didSendData(
     unsigned long long bytesSent,
     unsigned long long totalBytesToBeSent) {
   if (!m_client)
     return;
 
   m_client->didSendData(m_loader, bytesSent, totalBytesToBeSent);
 }
@@ skipping 294 matching lines @@
   // there could be a WebURLLoader instance behind the
   // DocumentThreadableLoader instance. So, for safety, we chose to just
   // crash here.
   RELEASE_ASSERT(ThreadState::current());
 
   m_observer->dispose();
   m_observer = nullptr;
 }
 
 }  // namespace blink