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, 12 insertions, 12 deletions

diff --git a/chrome/test/accessibility/accessibility_tests.cc b/chrome/test/accessibility/accessibility_tests.cc
index bc42dbc..542ba7f 100644
--- a/chrome/test/accessibility/accessibility_tests.cc
+++ b/chrome/test/accessibility/accessibility_tests.cc
@@ -140,8 +140,8 @@ TEST_F(AccessibilityTest, DISABLED_TestBackBtnStatusOnNewTab) {
   // Set URL and check button status.
   scoped_ptr<TabProxy> tab1(window->GetTab(0));
   ASSERT_TRUE(tab1.get());
-  std::wstring test_file1 = test_data_directory_;
-  file_util::AppendToPath(&test_file1, L"title1.html");
+  FilePath test_file1(FilePath::FromWStringHack(test_data_directory_));
+  test_file1 = test_file1.AppendASCII("title1.html");
   tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP | STATE_SYSTEM_FOCUSABLE,
@@ -167,8 +167,8 @@ TEST_F(AccessibilityTest, DISABLED_TestBackBtnStatusOnNewTab) {
 
   // Add new tab with URL and check status.
   ASSERT_TRUE(window->GetTabCount(&tab_count));
-  std::wstring test_file2 = test_data_directory_;
-  file_util::AppendToPath(&test_file2, L"title1.html");
+  FilePath test_file2(FilePath::FromWStringHack(test_data_directory_));
+  test_file2 = test_file2.AppendASCII("title1.html");
   ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
   ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
                                               action_max_timeout_ms()));
@@ -242,8 +242,8 @@ TEST_F(AccessibilityTest, DISABLED_TestForwardBtnStatusOnNewTab) {
   // Set URL and check button status.
   scoped_ptr<TabProxy> tab1(window->GetTab(0));
   ASSERT_TRUE(tab1.get());
-  std::wstring test_file1 = test_data_directory_;
-  file_util::AppendToPath(&test_file1, L"title1.html");
+  FilePath test_file1(FilePath::FromWStringHack(test_data_directory_));
+  test_file1 = test_file1.AppendASCII("title1.html");
   tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP |
@@ -275,8 +275,8 @@ TEST_F(AccessibilityTest, DISABLED_TestForwardBtnStatusOnNewTab) {
 
   // Add new tab with URL and check status.
   ASSERT_TRUE(window->GetTabCount(&tab_count));
-  std::wstring test_file2 = test_data_directory_;
-  file_util::AppendToPath(&test_file2, L"title1.html");
+  FilePath test_file2(FilePath::FromWStringHack(test_data_directory_));
+  test_file2 = test_file2.AppendASCII("title1.html");
   ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
   ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
                                               action_max_timeout_ms()));
@@ -328,8 +328,8 @@ TEST_F(AccessibilityTest, DISABLED_TestStarBtnStatusOnNewTab) {
   // Set URL and check button status.
   scoped_ptr<TabProxy> tab1(window->GetTab(0));
   ASSERT_TRUE(tab1.get());
-  std::wstring test_file1 = test_data_directory_;
-  file_util::AppendToPath(&test_file1, L"title1.html");
+  FilePath test_file1(FilePath::FromWStringHack(test_data_directory_));
+  test_file1 = test_file1.AppendASCII("title1.html");
   tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_FOCUSABLE, GetState(acc_obj));
@@ -346,8 +346,8 @@ TEST_F(AccessibilityTest, DISABLED_TestStarBtnStatusOnNewTab) {
 
   // Add new tab with URL and check status.
   ASSERT_TRUE(window->GetTabCount(&tab_count));
-  std::wstring test_file2 = test_data_directory_;
-  file_util::AppendToPath(&test_file2, L"title1.html");
+  FilePath test_file2(FilePath::FromWStringHack(test_data_directory_));
+  test_file2 = test_file2.AppendASCII("title1.html");
   ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
   ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
                                               action_max_timeout_ms()));