Switching things to FilePath:

Remove following deprecated wstring-using functions:

net/net_util: FilePathToFileURL
net/net_util: FileURLToFilePath

Switch net/base/upload_data to FilePath.
Switch upload-related parts of net/url_request/url_request to FilePath.

Made necessary adjustments in rest of code (a lot).

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

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

5 files changed, 11 insertions, 8 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 0f80652..e049523 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -398,8 +398,9 @@ void RenderViewHost::DragTargetDragEnter(const WebDropData& drop_data,
   for (std::vector<std::wstring>::const_iterator
          iter(drop_data.filenames.begin());
        iter != drop_data.filenames.end(); ++iter) {
-    policy->GrantRequestURL(process()->pid(), net::FilePathToFileURL(*iter));
-    policy->GrantUploadFile(process()->pid(), FilePath::FromWStringHack(*iter));
+    FilePath path = FilePath::FromWStringHack(*iter);
+    policy->GrantRequestURL(process()->pid(), net::FilePathToFileURL(path));
+    policy->GrantUploadFile(process()->pid(), path);
   }
   Send(new ViewMsg_DragTargetDragEnter(routing_id(), drop_data, client_pt,
                                        screen_pt));
diff --git a/chrome/browser/renderer_host/renderer_security_policy.h b/chrome/browser/renderer_host/renderer_security_policy.h
index 2064700..84fd32c 100644
--- a/chrome/browser/renderer_host/renderer_security_policy.h
+++ b/chrome/browser/renderer_host/renderer_security_policy.h
@@ -10,6 +10,7 @@
 #include <set>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/lock.h"
 #include "base/singleton.h"
 
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index b2b2c73..1a73ca5 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -122,9 +122,9 @@ bool ShouldServiceRequest(ChildProcessInfo::ProcessType process_type,
     std::vector<net::UploadData::Element>::const_iterator iter;
     for (iter = uploads.begin(); iter != uploads.end(); ++iter) {
       if (iter->type() == net::UploadData::TYPE_FILE &&
-        !policy->CanUploadFile(process_id,
-                               FilePath::FromWStringHack(iter->file_path()))) {
-        NOTREACHED() << "Denied unauthorized upload of " << iter->file_path();
+          !policy->CanUploadFile(process_id, iter->file_path())) {
+        NOTREACHED() << "Denied unauthorized upload of "
+                     << iter->file_path().value();
         return false;
       }
     }
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index d44080f..682336a 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -231,8 +231,8 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationNonBuffered) {
 
   // Now load a file:// page, which does not use the BufferedEventHandler.
   // Make sure that the page loads and displays a title, and doesn't get stuck.
-  std::wstring test_file = test_data_directory_;
-  file_util::AppendToPath(&test_file, L"title2.html");
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
+  test_file = test_file.AppendASCII("title2.html");
   bool timed_out = false;
   tab->NavigateToURLWithTimeout(net::FilePathToFileURL(test_file),
                                 action_max_timeout_ms(),
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index 7c389d5..bfd2d2c 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <vector>
 
+#include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
@@ -532,7 +533,7 @@ TEST_F(ResourceDispatcherHostTest, CalculateApproximateMemoryCost) {
   EXPECT_EQ(4434, ResourceDispatcherHost::CalculateApproximateMemoryCost(&req));
 
   // Add a file upload -- should have no effect.
-  req.AppendFileToUpload(L"does-not-exist.png");
+  req.AppendFileToUpload(FilePath(FILE_PATH_LITERAL("does-not-exist.png")));
   EXPECT_EQ(4434, ResourceDispatcherHost::CalculateApproximateMemoryCost(&req));
 }