Change url wstrings to GURLS

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

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

10 files changed, 21 insertions, 20 deletions

diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc
index d8f66a8..66ef1f3 100644
--- a/chrome/browser/renderer_host/buffered_resource_handler.cc
+++ b/chrome/browser/renderer_host/buffered_resource_handler.cc
@@ -248,7 +248,7 @@ bool BufferedResourceHandler::CompleteResponseStarted(int request_id,
     scoped_refptr<DownloadThrottlingResourceHandler> download_handler =
         new DownloadThrottlingResourceHandler(host_,
                                            request_,
-                                           request_->url().spec(),
+                                           request_->url(),
                                            info->render_process_host_id,
                                            info->render_view_id,
                                            request_id,
diff --git a/chrome/browser/renderer_host/download_resource_handler.cc b/chrome/browser/renderer_host/download_resource_handler.cc
index de34a60..9351f56 100644
--- a/chrome/browser/renderer_host/download_resource_handler.cc
+++ b/chrome/browser/renderer_host/download_resource_handler.cc
@@ -19,7 +19,7 @@ DownloadResourceHandler::DownloadResourceHandler(ResourceDispatcherHost* rdh,
                                                  int render_process_host_id,
                                                  int render_view_id,
                                                  int request_id,
-                                                 const std::string& url,
+                                                 const GURL& url,
                                                  DownloadFileManager* manager,
                                                  URLRequest* request,
                                                  bool save_as)
@@ -27,7 +27,7 @@ DownloadResourceHandler::DownloadResourceHandler(ResourceDispatcherHost* rdh,
       global_id_(ResourceDispatcherHost::GlobalRequestID(render_process_host_id,
                                                          request_id)),
       render_view_id_(render_view_id),
-      url_(UTF8ToWide(url)),
+      url_(url),
       content_length_(0),
       download_manager_(manager),
       request_(request),
@@ -40,7 +40,7 @@ DownloadResourceHandler::DownloadResourceHandler(ResourceDispatcherHost* rdh,
 // Not needed, as this event handler ought to be the final resource.
 bool DownloadResourceHandler::OnRequestRedirected(int request_id,
                                                   const GURL& url) {
-  url_ = UTF8ToWide(url.spec());
+  url_ = url;
   return true;
 }
 
diff --git a/chrome/browser/renderer_host/download_resource_handler.h b/chrome/browser/renderer_host/download_resource_handler.h
index 0dbeef0..dfc047e 100644
--- a/chrome/browser/renderer_host/download_resource_handler.h
+++ b/chrome/browser/renderer_host/download_resource_handler.h
@@ -19,7 +19,7 @@ class DownloadResourceHandler : public ResourceHandler {
                           int render_process_host_id,
                           int render_view_id,
                           int request_id,
-                          const std::string& url,
+                          const GURL& url,
                           DownloadFileManager* manager,
                           URLRequest* request,
                           bool save_as);
@@ -56,7 +56,7 @@ class DownloadResourceHandler : public ResourceHandler {
   int render_view_id_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   std::string content_disposition_;
-  std::wstring url_;
+  GURL url_;
   int64 content_length_;
   DownloadFileManager* download_manager_;
   URLRequest* request_;
diff --git a/chrome/browser/renderer_host/download_throttling_resource_handler.cc b/chrome/browser/renderer_host/download_throttling_resource_handler.cc
index ea4fdbb..f049788 100644
--- a/chrome/browser/renderer_host/download_throttling_resource_handler.cc
+++ b/chrome/browser/renderer_host/download_throttling_resource_handler.cc
@@ -10,7 +10,7 @@
 DownloadThrottlingResourceHandler::DownloadThrottlingResourceHandler(
     ResourceDispatcherHost* host,
     URLRequest* request,
-    const std::string& url,
+    const GURL& url,
     int render_process_host_id,
     int render_view_id,
     int request_id,
@@ -44,7 +44,7 @@ bool DownloadThrottlingResourceHandler::OnRequestRedirected(int request_id,
                                                             const GURL& url) {
   if (download_handler_.get())
     return download_handler_->OnRequestRedirected(request_id, url);
-  url_ = url.spec();
+  url_ = url;
   return true;
 }
 
diff --git a/chrome/browser/renderer_host/download_throttling_resource_handler.h b/chrome/browser/renderer_host/download_throttling_resource_handler.h
index 6f7c3d9..80c5a00 100644
--- a/chrome/browser/renderer_host/download_throttling_resource_handler.h
+++ b/chrome/browser/renderer_host/download_throttling_resource_handler.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "chrome/browser/renderer_host/resource_handler.h"
+#include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN)
 // TODO(port): Remove ifdef when downloads are ported.
@@ -33,7 +34,7 @@ class DownloadThrottlingResourceHandler
  public:
   DownloadThrottlingResourceHandler(ResourceDispatcherHost* host,
                                     URLRequest* request,
-                                    const std::string& url,
+                                    const GURL& url,
                                     int render_process_host_id,
                                     int render_view_id,
                                     int request_id,
@@ -61,7 +62,7 @@ class DownloadThrottlingResourceHandler
 
   ResourceDispatcherHost* host_;
   URLRequest* request_;
-  std::string url_;
+  GURL url_;
   int render_process_host_id_;
   int render_view_id_;
   int request_id_;
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index b78c4c9..d8d34f7 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -1223,7 +1223,7 @@ void RenderViewHost::OnDidGetApplicationInfo(
 }
 
 void RenderViewHost::GetSerializedHtmlDataForCurrentPageWithLocalLinks(
-    const std::vector<std::wstring>& links,
+    const std::vector<GURL>& links,
     const std::vector<std::wstring>& local_paths,
     const std::wstring& local_directory_name) {
   Send(new ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks(
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 2cd9d29..01f1097 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -351,7 +351,7 @@ class RenderViewHost : public RenderWidgetHost {
   // The parameter local_directory_name is relative path of directory which
   // contain all saved auxiliary files included all sub frames and resouces.
   void GetSerializedHtmlDataForCurrentPageWithLocalLinks(
-      const std::vector<std::wstring>& links,
+      const std::vector<GURL>& links,
       const std::vector<std::wstring>& local_paths,
       const std::wstring& local_directory_name);
 
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 65b5c3d..5c1bd26 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -349,7 +349,7 @@ void ResourceDispatcherHost::BeginDownload(const GURL& url,
                                   render_process_host_id,
                                   render_view_id,
                                   request_id_,
-                                  url.spec(),
+                                  url,
                                   download_file_manager_.get(),
                                   request,
                                   true);
@@ -405,7 +405,7 @@ void ResourceDispatcherHost::BeginSaveFile(const GURL& url,
   scoped_refptr<ResourceHandler> handler =
       new SaveFileResourceHandler(render_process_host_id,
                                   render_view_id,
-                                  url.spec(),
+                                  url,
                                   save_file_manager_.get());
   request_id_--;
 
diff --git a/chrome/browser/renderer_host/save_file_resource_handler.cc b/chrome/browser/renderer_host/save_file_resource_handler.cc
index 3a1b753..139f5a00 100644
--- a/chrome/browser/renderer_host/save_file_resource_handler.cc
+++ b/chrome/browser/renderer_host/save_file_resource_handler.cc
@@ -14,19 +14,19 @@
 
 SaveFileResourceHandler::SaveFileResourceHandler(int render_process_host_id,
                                                  int render_view_id,
-                                                 const std::string& url,
+                                                 const GURL& url,
                                                  SaveFileManager* manager)
     : save_id_(-1),
       render_process_id_(render_process_host_id),
       render_view_id_(render_view_id),
-      url_(UTF8ToWide(url)),
+      url_(url),
       content_length_(0),
       save_manager_(manager) {
 }
 
 bool SaveFileResourceHandler::OnRequestRedirected(int request_id,
                                                   const GURL& url) {
-  final_url_ = UTF8ToWide(url.spec());
+  final_url_ = url;
   return true;
 }
 
diff --git a/chrome/browser/renderer_host/save_file_resource_handler.h b/chrome/browser/renderer_host/save_file_resource_handler.h
index 30fc074..63d78ad 100644
--- a/chrome/browser/renderer_host/save_file_resource_handler.h
+++ b/chrome/browser/renderer_host/save_file_resource_handler.h
@@ -16,7 +16,7 @@ class SaveFileResourceHandler : public ResourceHandler {
  public:
   SaveFileResourceHandler(int render_process_host_id,
                           int render_view_id,
-                          const std::string& url,
+                          const GURL& url,
                           SaveFileManager* manager);
 
   // Saves the redirected URL to final_url_, we need to use the original
@@ -53,8 +53,8 @@ class SaveFileResourceHandler : public ResourceHandler {
   int render_view_id_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   std::string content_disposition_;
-  std::wstring url_;
-  std::wstring final_url_;
+  GURL url_;
+  GURL final_url_;
   int64 content_length_;
   SaveFileManager* save_manager_;