More refactoring for WebPlugin.

This CL eliminates direct calls to WebPluginDelegate::DidFinishLoadWithReason
from WebFrameLoaderClient.

This CL also moves WebDataSourceImpl into webkit/api/src.  That change was
needed so that WebPluginContainerImpl can add a WebPluginLoadObserver to it,
which WebFrameLoaderClient uses to communicate back to the WebPlugin upon
completion of the frame load.

WebViewDelegate::DidFinishLoadWithReason is modified to include url and
notify_data parameters, eliminating the URLRequestRouted method.  This is done
so that we can support overlapping NPN_GetURLNotify targetting different
frames.

WebPluginContainer grows an executeScriptURL method to deal with javascript:
URLs.

NOTE: I'm working on some UI tests to better cover the case of overlapping
NPN_GetURLNotify calls.

R=jam
BUG=10036
TEST=none yet

Review URL: http://codereview.chromium.org/174514

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24655 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 11 deletions

diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 56da66c..c72c654 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -306,8 +306,8 @@ bool WebPluginDelegateProxy::Send(IPC::Message* msg) {
   return channel_host_->Send(msg);
 }
 
-void WebPluginDelegateProxy::SendJavaScriptStream(const std::string& url,
-                                                  const std::wstring& result,
+void WebPluginDelegateProxy::SendJavaScriptStream(const GURL& url,
+                                                  const std::string& result,
                                                   bool success,
                                                   bool notify_needed,
                                                   intptr_t notify_data) {
@@ -756,8 +756,10 @@ NPObject* WebPluginDelegateProxy::GetPluginScriptableObject() {
   return WebBindings::retainObject(npobject_);
 }
 
-void WebPluginDelegateProxy::DidFinishLoadWithReason(NPReason reason) {
-  Send(new PluginMsg_DidFinishLoadWithReason(instance_id_, reason));
+void WebPluginDelegateProxy::DidFinishLoadWithReason(
+    const GURL& url, NPReason reason, intptr_t notify_data) {
+  Send(new PluginMsg_DidFinishLoadWithReason(
+      instance_id_, url, reason, notify_data));
 }
 
 void WebPluginDelegateProxy::SetFocus() {
@@ -1056,13 +1058,6 @@ WebPluginResourceClient* WebPluginDelegateProxy::CreateResourceClient(
   return proxy;
 }
 
-void WebPluginDelegateProxy::URLRequestRouted(const std::string& url,
-                                               bool notify_needed,
-                                               intptr_t notify_data) {
-  Send(new PluginMsg_URLRequestRouted(instance_id_, url, notify_needed,
-                                      notify_data));
-}
-
 void WebPluginDelegateProxy::OnCancelDocumentLoad() {
   plugin_->CancelDocumentLoad();
 }