More removal of WebCore usage from webplugin_impl.cc

Adds a few helper methods on WebFrame.

R=jam
BUG=10036
TEST=none

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

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

6 files changed, 10 insertions, 10 deletions

diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h
index 5c35544..662f60a 100644
--- a/chrome/common/plugin_messages.h
+++ b/chrome/common/plugin_messages.h
@@ -57,7 +57,7 @@ struct PluginHostMsg_URLRequest_Params {
 
 struct PluginMsg_URLRequestReply_Params {
   int resource_id;
-  std::string url;
+  GURL url;
   bool notify_needed;
   intptr_t notify_data;
   intptr_t stream;
diff --git a/chrome/common/plugin_messages_internal.h b/chrome/common/plugin_messages_internal.h
index ce934a2..d2e2e64 100644
--- a/chrome/common/plugin_messages_internal.h
+++ b/chrome/common/plugin_messages_internal.h
@@ -205,7 +205,7 @@ IPC_BEGIN_MESSAGES(Plugin)
                       intptr_t /* notify data */)
 
   IPC_MESSAGE_ROUTED2(PluginMsg_DidReceiveManualResponse,
-                      std::string /* url */,
+                      GURL /* url */,
                       PluginMsg_DidReceiveResponseParams)
 
   IPC_MESSAGE_ROUTED1(PluginMsg_DidReceiveManualData,
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index c42815a..a8a652f 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -309,7 +309,7 @@ void WebPluginDelegateStub::OnSendJavaScriptStream(const std::string& url,
 }
 
 void WebPluginDelegateStub::OnDidReceiveManualResponse(
-    const std::string& url,
+    const GURL& url,
     const PluginMsg_DidReceiveResponseParams& params) {
   delegate_->DidReceiveManualResponse(url, params.mime_type, params.headers,
                                       params.expected_length,
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index 519a648..e385156 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -79,7 +79,7 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
                               intptr_t notify_data);
 
   void OnDidReceiveManualResponse(
-      const std::string& url,
+      const GURL& url,
       const PluginMsg_DidReceiveResponseParams& params);
   void OnDidReceiveManualData(const std::vector<char>& buffer);
   void OnDidFinishManualLoading();
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index ef2a3d4..db73717 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -70,7 +70,7 @@ class ResourceClientProxy : public WebPluginResourceClient {
   ~ResourceClientProxy() {
   }
 
-  void Initialize(int resource_id, const std::string &url, bool notify_needed,
+  void Initialize(int resource_id, const GURL& url, bool notify_needed,
                   intptr_t notify_data, intptr_t existing_stream) {
     resource_id_ = resource_id;
     url_ = url;
@@ -150,7 +150,7 @@ class ResourceClientProxy : public WebPluginResourceClient {
   scoped_refptr<PluginChannelHost> channel_;
   int instance_id_;
   int resource_id_;
-  std::string url_;
+  GURL url_;
   bool notify_needed_;
   intptr_t notify_data_;
   // Set to true if the response expected is a multibyte response.
@@ -316,7 +316,7 @@ void WebPluginDelegateProxy::SendJavaScriptStream(const std::string& url,
 }
 
 void WebPluginDelegateProxy::DidReceiveManualResponse(
-    const std::string& url, const std::string& mime_type,
+    const GURL& url, const std::string& mime_type,
     const std::string& headers, uint32 expected_length,
     uint32 last_modified) {
   PluginMsg_DidReceiveResponseParams params;
@@ -1021,7 +1021,7 @@ void WebPluginDelegateProxy::OnHandleURLRequest(
 }
 
 WebPluginResourceClient* WebPluginDelegateProxy::CreateResourceClient(
-    int resource_id, const std::string &url, bool notify_needed,
+    int resource_id, const GURL& url, bool notify_needed,
     intptr_t notify_data, intptr_t npstream) {
   ResourceClientProxy* proxy = new ResourceClientProxy(channel_host_,
                                                        instance_id_);
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 7d70dd3..808c06e 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -76,7 +76,7 @@ class WebPluginDelegateProxy : public WebPluginDelegate,
                                     bool success, bool notify_needed,
                                     intptr_t notify_data);
 
-  virtual void DidReceiveManualResponse(const std::string& url,
+  virtual void DidReceiveManualResponse(const GURL& url,
                                         const std::string& mime_type,
                                         const std::string& headers,
                                         uint32 expected_length,
@@ -87,7 +87,7 @@ class WebPluginDelegateProxy : public WebPluginDelegate,
   virtual FilePath GetPluginPath();
   virtual void InstallMissingPlugin();
   virtual WebPluginResourceClient* CreateResourceClient(int resource_id,
-                                                        const std::string &url,
+                                                        const GURL& url,
                                                         bool notify_needed,
                                                         intptr_t notify_data,
                                                         intptr_t existing_stream);