Monster FilePath patch!

chrome/test/accessibility/accessibility_tests.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <oleacc.h>
 
 #include "base/file_util.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/l10n_util.h"
@@ skipping 122 matching lines @@
             GetState(acc_obj));
 
   // Now check Back status in different situations.
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   int tab_count = -1;
 
   // 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,
             GetState(acc_obj));
   // Go Back and check status.
   window->ApplyAccelerator(IDC_BACK);
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP |
             STATE_SYSTEM_FOCUSABLE |
             STATE_SYSTEM_UNAVAILABLE,
             GetState(acc_obj));
 
   // Add empty new tab and check status.
   ASSERT_TRUE(window->GetTabCount(&tab_count));
   ASSERT_TRUE(window->ApplyAccelerator(IDC_NEW_TAB));
   ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
                                               action_max_timeout_ms()));
   // Check accessibility object's children.
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP |
             STATE_SYSTEM_FOCUSABLE |
             STATE_SYSTEM_UNAVAILABLE,
             GetState(acc_obj));
 
   // 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()));
   // Check accessibility object's children.
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP |
             STATE_SYSTEM_FOCUSABLE |
             STATE_SYSTEM_UNAVAILABLE,
             GetState(acc_obj));
   CHK_RELEASE(acc_obj);
@@ skipping 53 matching lines @@
   }
 
   // Now check Back status in different situations.
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   int tab_count = -1;
 
   // 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 |
             STATE_SYSTEM_UNAVAILABLE,
             GetState(acc_obj));
   // Go Back and check status.
   window->ApplyAccelerator(IDC_BACK);
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP | STATE_SYSTEM_FOCUSABLE,
@@ skipping 11 matching lines @@
   ASSERT_TRUE(window->ApplyAccelerator(IDC_NEW_TAB));
   ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
                                               action_max_timeout_ms()));
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP |
             STATE_SYSTEM_FOCUSABLE |
             STATE_SYSTEM_UNAVAILABLE,
             GetState(acc_obj));
 
   // 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()));
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_HASPOPUP |
             STATE_SYSTEM_FOCUSABLE |
             STATE_SYSTEM_UNAVAILABLE,
             GetState(acc_obj));
   CHK_RELEASE(acc_obj);
 }
@@ skipping 31 matching lines @@
   EXPECT_EQ(ROLE_SYSTEM_PUSHBUTTON, GetRole(acc_obj));
   EXPECT_EQ(STATE_SYSTEM_FOCUSABLE, GetState(acc_obj));
 
   // Now, check Star status in different situations.
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   // 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));
 
   // Add empty new tab and check status.
   int tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&tab_count));
   ASSERT_TRUE(window->ApplyAccelerator(IDC_NEW_TAB));
   ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
                                               action_max_timeout_ms()));
   // Check tab count. Also, check accessibility object's state.
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_FOCUSABLE, GetState(acc_obj));
 
   // 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()));
   // Check tab count. Also, check accessibility object's state.
   Sleep(sleep_timeout_ms());
   EXPECT_EQ(STATE_SYSTEM_FOCUSABLE, GetState(acc_obj));
 
   CHK_RELEASE(acc_obj);
 }
 
@@ skipping 55 matching lines @@
   // State "has popup" only supported in XP and higher.
   if (win_util::GetWinVersion() > win_util::WINVERSION_2000) {
     EXPECT_EQ(STATE_SYSTEM_HASPOPUP | STATE_SYSTEM_FOCUSABLE,
               GetState(acc_obj));
   } else {
     EXPECT_EQ(STATE_SYSTEM_FOCUSABLE, GetState(acc_obj));
   }
 
   CHK_RELEASE(acc_obj);
 }