Remove a bunch of provisionalDataSource() usage.

third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
index d926ef8f5f7bde9a20591c96938bff8271a9e3fc..69abb543f3706e989718bf1a9a4008df26509268 100644
--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
@@ -356,12 +356,14 @@ void FrameLoaderClientImpl::dispatchWillSendRequest(
     DocumentLoader* loader, unsigned long identifier, ResourceRequest& request,
     const ResourceResponse& redirectResponse)
 {
+    if (!loader)
+        loader = m_webFrame->frame()->loader().documentLoader();
     // Give the WebFrameClient a crack at the request.
     if (m_webFrame->client()) {
         WrappedResourceRequest webreq(request);
         WrappedResourceResponse webresp(redirectResponse);
         m_webFrame->client()->willSendRequest(
-            m_webFrame, identifier, webreq, webresp);
+            WebDataSourceImpl::fromDocumentLoader(loader), identifier, webreq, webresp);
     }
 }
 
@@ -434,10 +436,10 @@ void FrameLoaderClientImpl::dispatchWillClose()
         m_webFrame->client()->willClose(m_webFrame);
 }
 
-void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(double triggeringEventTime)
+void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(DocumentLoader* loader, double triggeringEventTime)
 {
     if (m_webFrame->client())
-        m_webFrame->client()->didStartProvisionalLoad(m_webFrame, triggeringEventTime);
+        m_webFrame->client()->didStartProvisionalLoad(WebDataSourceImpl::fromDocumentLoader(loader), triggeringEventTime);
 }
 
 void FrameLoaderClientImpl::dispatchDidReceiveTitle(const String& title)
@@ -462,19 +464,21 @@ void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm
         devToolsAgent->didCommitLoadForLocalFrame(m_webFrame->frame());
 }
 
-void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(
+void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(DocumentLoader* loader,
     const ResourceError& error, HistoryCommitType commitType)
 {
-    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().provisionalDocumentLoader());
-    m_webFrame->didFail(error, true, commitType);
+    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(loader);
+    if (m_webFrame->client())
+        m_webFrame->client()->didFailProvisionalLoad(WebDataSourceImpl::fromDocumentLoader(loader), error, static_cast<WebHistoryCommitType>(commitType));
     if (observer)
         observer->didFailLoading(error);
 }
 
-void FrameLoaderClientImpl::dispatchDidFailLoad(const ResourceError& error, HistoryCommitType commitType)
+void FrameLoaderClientImpl::dispatchDidFailLoad(DocumentLoader* loader, const ResourceError& error, HistoryCommitType commitType)
 {
-    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());
-    m_webFrame->didFail(error, false, commitType);
+    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(loader);
+    if (m_webFrame->client())
+        m_webFrame->client()->didFailLoad(WebDataSourceImpl::fromDocumentLoader(loader), error, static_cast<WebHistoryCommitType>(commitType));
     if (observer)
         observer->didFailLoading(error);
 
@@ -580,10 +584,10 @@ void FrameLoaderClientImpl::dispatchWillSendSubmitEvent(HTMLFormElement* form)
         m_webFrame->client()->willSendSubmitEvent(m_webFrame, WebFormElement(form));
 }
 
-void FrameLoaderClientImpl::dispatchWillSubmitForm(HTMLFormElement* form)
+void FrameLoaderClientImpl::dispatchWillSubmitForm(DocumentLoader* loader, HTMLFormElement* form)
 {
     if (m_webFrame->client())
-        m_webFrame->client()->willSubmitForm(m_webFrame, WebFormElement(form));
+        m_webFrame->client()->willSubmitForm(WebDataSourceImpl::fromDocumentLoader(loader), WebFormElement(form));
 }
 
 void FrameLoaderClientImpl::didStartLoading(LoadStartType loadStartType)