WebKit side of merge from r41149 to r41181.

WebCore/xml/XMLHttpRequest.cpp

 /*
  *  Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
  *  Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
  *  Copyright (C) 2008 David Levin <levin@chromium.org>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
@@ skipping 1150 matching lines @@
         return;
 
     if (error.isCancellation()) {
         abortError();
         return;
     }
 
     networkError();
 }
 
-void XMLHttpRequest::didFailWillSendRequestCheck()
+void XMLHttpRequest::didFailRedirectCheck()
 {
     internalAbort();
     networkError();
 }
 
 void XMLHttpRequest::didFinishLoading(unsigned long identifier)
 {
     if (m_error)
         return;
 
@@ skipping 229 matching lines @@
     ASSERT(!m_loader);
     ActiveDOMObject::contextDestroyed();
 }
 
 ScriptExecutionContext* XMLHttpRequest::scriptExecutionContext() const
 {
     return ActiveDOMObject::scriptExecutionContext();
 }
 
 } // namespace WebCore