Merge 112485 - AssociatedURLLoader does not support Cross Origin Redirects when using

Source/WebKit/chromium/src/AssociatedURLLoader.cpp

Index: Source/WebKit/chromium/src/AssociatedURLLoader.cpp
===================================================================
--- Source/WebKit/chromium/src/AssociatedURLLoader.cpp	(revision 113196)
+++ Source/WebKit/chromium/src/AssociatedURLLoader.cpp	(working copy)
@@ -140,6 +140,7 @@
     virtual void didReceiveCachedMetadata(const char*, int /*dataLength*/);
     virtual void didFinishLoading(unsigned long /*identifier*/, double /*finishTime*/);
     virtual void didFail(const ResourceError&);
+    virtual void didFailRedirectCheck();
 
     virtual bool isDocumentThreadableLoaderClient() { return true; }
 
@@ -263,6 +264,11 @@
         notifyError(&m_errorTimer);
 }
 
+void AssociatedURLLoader::ClientAdapter::didFailRedirectCheck()
+{
+    m_loader->cancel();
+}
+
 void AssociatedURLLoader::ClientAdapter::setDelayedError(const ResourceError& error)
 {
     didFail(error);