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

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc
index 9e6940ed..a994767 100644
--- a/chrome/browser/metrics/metrics_service_uitest.cc
+++ b/chrome/browser/metrics/metrics_service_uitest.cc
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
@@ -33,14 +34,14 @@ class MetricsServiceTest : public UITest {
     window_ = automation()->GetBrowserWindow(0);
     ASSERT_TRUE(window_);
 
-    std::wstring page1_path;
+    FilePath page1_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &page1_path));
-    file_util::AppendToPath(&page1_path, L"title2.html");
+    page1_path = page1_path.AppendASCII("title2.html");
     ASSERT_TRUE(window_->AppendTab(net::FilePathToFileURL(page1_path)));
 
-    std::wstring page2_path;
+    FilePath page2_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &page2_path));
-    file_util::AppendToPath(&page2_path, L"iframe.html");
+    page2_path = page2_path.AppendASCII("iframe.html");
     ASSERT_TRUE(window_->AppendTab(net::FilePathToFileURL(page2_path)));
   }