Monster FilePath patch!

chrome/browser/browser_uitest.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 "base/file_util.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 43 matching lines @@
   VisibleBrowserTest() : UITest() {
     show_window_ = true;
   }
 };
 
 }  // namespace
 
 // Launch the app on a page with no title, check that the app title was set
 // correctly.
 TEST_F(BrowserTest, NoTitle) {
-  std::wstring test_file = test_data_directory_;
-  file_util::AppendToPath(&test_file, L"title1.html");
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
+  test_file = test_file.AppendASCII("title1.html");
 
   NavigateToURL(net::FilePathToFileURL(test_file));
   Sleep(sleep_timeout_ms());  // The browser lazily updates the title.
 
   EXPECT_EQ(WindowCaptionFromPageTitle(L"title1.html"), GetWindowTitle());
   EXPECT_EQ(L"title1.html", GetActiveTabTitle());
 }
 
 // Launch the app, navigate to a page with a title, check that the app title
 // was set correctly.
 TEST_F(BrowserTest, Title) {
-  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");
 
   NavigateToURL(net::FilePathToFileURL(test_file));
   Sleep(sleep_timeout_ms());  // The browser lazily updates the title.
 
   const std::wstring test_title(L"Title Of Awesomeness");
   EXPECT_EQ(WindowCaptionFromPageTitle(test_title), GetWindowTitle());
   EXPECT_EQ(test_title, GetActiveTabTitle());
 }
 
 // Create 34 tabs and verify that a lot of processes have been created. The
 // exact number of processes depends on the amount of memory. Previously we
 // had a hard limit of 31 processes and this test is mainly directed at
 // verifying that we don't crash when we pass this limit.
 TEST_F(BrowserTest, ThirtyFourTabs) {
-  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");
   GURL url(net::FilePathToFileURL(test_file));
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   // There is one initial tab.
   for (int ix = 0; ix != 33; ++ix) {
     EXPECT_TRUE(window->AppendTab(url));
   }
   int tab_count = 0;
   EXPECT_TRUE(window->GetTabCount(&tab_count));
   EXPECT_EQ(34, tab_count);
   // Do not test the rest in single process mode.
   if (in_process_renderer())
     return;
   // See browser\renderer_host\render_process_host.cc for the algorithm to
   // decide how many processes to create.
   int process_count = GetBrowserProcessCount();
   if (base::SysInfo::AmountOfPhysicalMemoryMB() >= 2048) {
     EXPECT_GE(process_count, 24);
   } else {
     EXPECT_LE(process_count, 23);
   }
 }
 
 // The browser should quit quickly if it receives a WM_ENDSESSION message.
 TEST_F(BrowserTest, WindowsSessionEnd) {
-  std::wstring test_file = test_data_directory_;
-  file_util::AppendToPath(&test_file, L"title1.html");
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
+  test_file = test_file.AppendASCII("title1.html");
 
   NavigateToURL(net::FilePathToFileURL(test_file));
   Sleep(action_timeout_ms());
 
   // Simulate an end of session. Normally this happens when the user
   // shuts down the pc or logs off.
   HWND window_handle = GetMainWindow();
   ASSERT_TRUE(::PostMessageW(window_handle, WM_ENDSESSION, 0, 0));
 
   Sleep(action_timeout_ms());
@@ skipping 48 matching lines @@
 #ifdef CHROME_V8
 TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
   // This test only works in multi-process mode
   if (in_process_renderer())
     return;
 
   const wchar_t kDocRoot[] = L"chrome/test/data";
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
-  std::wstring test_file(test_data_directory_);
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   scoped_ptr<TabProxy> tab(window->GetActiveTab());
 
   // Start with a file:// url
-  file_util::AppendToPath(&test_file, L"title2.html");
+  test_file = test_file.AppendASCII("title2.html");
   tab->NavigateToURL(net::FilePathToFileURL(test_file));
   int orig_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&orig_tab_count));
   int orig_process_count = GetBrowserProcessCount();
   ASSERT_GE(orig_process_count, 1);
 
   // Use JavaScript URL to "fork" a new tab, just like Gmail.  (Open tab to a
   // blank page, set its opener to null, and redirect it cross-site.)
   std::wstring url_prefix(L"javascript:(function(){w=window.open();");
   GURL fork_url(url_prefix +
@@ skipping 14 matching lines @@
 // a same-page-redirect) will not fork a new process.
 TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
   // This test only works in multi-process mode
   if (in_process_renderer())
     return;
 
   const wchar_t kDocRoot[] = L"chrome/test/data";
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
-  std::wstring test_file(test_data_directory_);
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   scoped_ptr<TabProxy> tab(window->GetActiveTab());
 
   // Start with a file:// url
-  file_util::AppendToPath(&test_file, L"title2.html");
+  test_file = test_file.AppendASCII("title2.html");
   tab->NavigateToURL(net::FilePathToFileURL(test_file));
   int orig_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&orig_tab_count));
   int orig_process_count = GetBrowserProcessCount();
   ASSERT_GE(orig_process_count, 1);
 
   // Use JavaScript URL to almost fork a new tab, but not quite.  (Leave the
   // opener non-null.)  Should not fork a process.
   std::wstring url_prefix(L"javascript:(function(){w=window.open();");
   GURL dont_fork_url(url_prefix +
@@ skipping 11 matching lines @@
   GURL dont_fork_url2(url_prefix +
       L"document.location=\"http://localhost:1337\";})()");
 
   // Make sure that no new process has been created.
   tab->NavigateToURLAsync(dont_fork_url2);
   Sleep(action_timeout_ms());
   ASSERT_EQ(orig_process_count, GetBrowserProcessCount());
 }
 
 TEST_F(VisibleBrowserTest, WindowOpenClose) {
-  std::wstring test_file(test_data_directory_);
-  file_util::AppendToPath(&test_file, L"window.close.html");
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
+  test_file = test_file.AppendASCII("window.close.html");
 
   NavigateToURL(net::FilePathToFileURL(test_file));
 
   int i;
   for (i = 0; i < 10; ++i) {
     Sleep(action_max_timeout_ms() / 10);
     std::wstring title = GetActiveTabTitle();
     if (title == L"PASSED") {
       // Success, bail out.
       break;
     }
   }
 
   if (i == 10)
     FAIL() << "failed to get error page title";
 }