Change WebURLLoaderClient::willFollowRedirect() API to return bool

third_party/WebKit/Source/core/fetch/RawResource.cpp

 /*
  * Copyright (C) 2011 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 139 matching lines @@
   if (!hasClient(c))
     return;
   if (data())
     client->dataReceived(this, data()->data(), data()->size());
   CHECK(!isCacheValidator());
   if (!hasClient(c))
     return;
   Resource::didAddClient(client);
 }
 
-void RawResource::willFollowRedirect(ResourceRequest& newRequest,
+bool RawResource::willFollowRedirect(const ResourceRequest& newRequest,
                                      const ResourceResponse& redirectResponse) {
-  Resource::willFollowRedirect(newRequest, redirectResponse);
+  bool follow = Resource::willFollowRedirect(newRequest, redirectResponse);
+  // The base class method takes a non const reference of a ResourceRequest
+  // and returns bool just for allowing RawResource to reject redirect. It
+  // must always return true.
+  DCHECK(follow);
 
   DCHECK(!redirectResponse.isNull());
   ResourceClientWalker<RawResourceClient> w(clients());
-  while (RawResourceClient* c = w.next())
-    c->redirectReceived(this, newRequest, redirectResponse);
+  while (RawResourceClient* c = w.next()) {
+    if (!c->redirectReceived(this, newRequest, redirectResponse))
+      follow = false;
+  }
+
+  return follow;
 }
 
 void RawResource::willNotFollowRedirect() {
   ResourceClientWalker<RawResourceClient> w(clients());
   while (RawResourceClient* c = w.next())
     c->redirectBlocked();
 }
 
 void RawResource::responseReceived(
     const ResourceResponse& response,
@@ skipping 178 matching lines @@
   SECURITY_CHECK(m_state != NotAddedAsClient);
   SECURITY_CHECK(m_state != NotifyFinished);
   SECURITY_CHECK(resource->errorOccurred() ||
                  (m_state == ResponseReceived ||
                   m_state == SetSerializedCachedMetadata ||
                   m_state == DataReceived || m_state == DataDownloaded));
   m_state = NotifyFinished;
 }
 
 }  // namespace blink