Make WebURLLoaderMock handle redirects correctly in the case where the

webkit/support/weburl_loader_mock_factory.cc

 // Copyright (c) 2012 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 "webkit/support/weburl_loader_mock_factory.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
@@ skipping 53 matching lines @@
   // Serving a request might trigger more requests, so we cannot iterate on
   // pending_loaders_ as it might get modified.
   while (!pending_loaders_.empty()) {
     LoaderToRequestMap::iterator iter = pending_loaders_.begin();
     WebURLLoaderMock* loader = iter->first;
     const WebURLRequest& request = iter->second;
     WebURLResponse response;
     WebURLError error;
     WebData data;
     LoadRequest(request, &response, &error, &data);
-    // Follow any redirect chain.
+    // Follow any redirects while the loader is still active.
     while (response.httpStatusCode() >= 300 &&
            response.httpStatusCode() < 400) {
       WebURLRequest newRequest = loader->ServeRedirect(response);
-      if (loader->isDeferred())
+      if (!IsPending(loader) || loader->isDeferred())
         break;
       LoadRequest(newRequest, &response, &error, &data);
     }
-    if (!loader->isDeferred())
+    // Serve the request if the loader is still active.
+    if (IsPending(loader) && !loader->isDeferred())
       loader->ServeAsynchronousRequest(response, data, error);
-    // If the load has been canceled, the loader may not be in the map.
+    // The loader might have already been removed.
     pending_loaders_.erase(loader);
   }
 }
 
 bool WebURLLoaderMockFactory::IsMockedURL(const WebKit::WebURL& url) {
   return url_to_reponse_info_.find(url) != url_to_reponse_info_.end();
 }
 
 void WebURLLoaderMockFactory::CancelLoad(WebURLLoaderMock* loader) {
   LoaderToRequestMap::iterator iter = pending_loaders_.find(loader);
@@ skipping 34 matching lines @@
   }
 
   if (!ReadFile(iter->second.file_path, data)) {
     NOTREACHED();
     return;
   }
 
   *response = iter->second.response;
 }
 
+bool WebURLLoaderMockFactory::IsPending(WebURLLoaderMock* loader) {
+  LoaderToRequestMap::iterator iter = pending_loaders_.find(loader);
+  return iter != pending_loaders_.end();
+}
+
 // static
 bool WebURLLoaderMockFactory::ReadFile(const FilePath& file_path,
                                        WebData* data) {
   int64 file_size = 0;
   if (!file_util::GetFileSize(file_path, &file_size))
     return false;
 
   int size = static_cast<int>(file_size);
   scoped_array<char> buffer(new char[size]);
   data->reset();
   int read_count = file_util::ReadFile(file_path, buffer.get(), size);
   if (read_count == -1)
     return false;
   DCHECK(read_count == size);
   data->assign(buffer.get(), size);
 
   return true;
 }