Monster FilePath patch!

chrome/test/automation/automation_proxy_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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 176 matching lines @@
   ASSERT_TRUE(window->AppendTab(GURL("about:blank")));
   int tab_count;
   ASSERT_TRUE(window->GetTabCount(&tab_count));
   ASSERT_EQ(original_tab_count + 1, tab_count);
 
   int active_tab_index = -1;
   ASSERT_TRUE(window->GetActiveTabIndex(&active_tab_index));
   ASSERT_EQ(tab_count - 1, active_tab_index);
   ASSERT_NE(original_active_tab_index, active_tab_index);
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"title2.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("title2.html");
   ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(filename)));
 
   int appended_tab_index;
   // Append tab will also be active tab
   ASSERT_TRUE(window->GetActiveTabIndex(&appended_tab_index));
 
   scoped_ptr<TabProxy> tab(window->GetTab(appended_tab_index));
   ASSERT_TRUE(tab.get());
   std::wstring title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
@@ skipping 46 matching lines @@
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   std::wstring title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   // BUG [634097] : expected title should be "about:blank"
   ASSERT_STREQ(L"", title.c_str());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"title2.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("title2.html");
 
   tab->NavigateToURL(net::FilePathToFileURL(filename));
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 
   // TODO(vibhor) : Add a test using testserver.
 }
 
 // This test is disabled. See bug 794412
 TEST_F(AutomationProxyTest, DISABLED_NavigateToURLWithTimeout1) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"title2.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("title2.html");
 
   bool is_timeout;
   tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename),
                                 10000, &is_timeout);
   ASSERT_FALSE(is_timeout);
 
   std::wstring title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 
   tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename),
                                 1, &is_timeout);
   ASSERT_TRUE(is_timeout);
 
   Sleep(10);
 }
 
 // This test is disabled. See bug 794412.
 TEST_F(AutomationProxyTest, DISABLED_NavigateToURLWithTimeout2) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   tab.reset(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring filename1(test_data_directory_);
-  file_util::AppendToPath(&filename1, L"title1.html");
+  FilePath filename1(FilePath::FromWStringHack(test_data_directory_));
+  filename1 = filename1.AppendASCII("title1.html");
 
   bool is_timeout;
   tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename1),
                                 1, &is_timeout);
   ASSERT_TRUE(is_timeout);
 
-  std::wstring filename2(test_data_directory_);
-  file_util::AppendToPath(&filename2, L"title2.html");
+  FilePath filename2(FilePath::FromWStringHack(test_data_directory_));
+  filename2 = filename2.AppendASCII("title1.html");
   tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename2),
                                 10000, &is_timeout);
   ASSERT_FALSE(is_timeout);
 
   Sleep(10);
 }
 
 TEST_F(AutomationProxyTest, GoBackForward) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
   std::wstring title;
   ASSERT_TRUE(tab->GetTabTitle(&title));
   // BUG [634097] : expected title should be "about:blank"
   ASSERT_STREQ(L"", title.c_str());
 
   ASSERT_FALSE(tab->GoBack());
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"", title.c_str());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"title2.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("title2.html");
   ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 
   ASSERT_TRUE(tab->GoBack());
   ASSERT_TRUE(tab->GetTabTitle(&title));
   // BUG [634097] : expected title should be "about:blank"
   ASSERT_STREQ(L"", title.c_str());
 
   ASSERT_TRUE(tab->GoForward());
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 
   ASSERT_FALSE(tab->GoForward());
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 }
 
 TEST_F(AutomationProxyTest, GetCurrentURL) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
   GURL url;
   ASSERT_TRUE(tab->GetCurrentURL(&url));
   ASSERT_STREQ("about:blank", url.spec().c_str());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"cookie1.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("cookie1.html");
   GURL newurl = net::FilePathToFileURL(filename);
   ASSERT_TRUE(tab->NavigateToURL(newurl));
   ASSERT_TRUE(tab->GetCurrentURL(&url));
   // compare canonical urls...
   ASSERT_STREQ(newurl.spec().c_str(), url.spec().c_str());
 }
 
 class AutomationProxyTest2 : public AutomationProxyVisibleTest {
  protected:
   AutomationProxyTest2() {
@@ skipping 85 matching lines @@
   ASSERT_TRUE(handle);
 }
 
 TEST_F(AutomationProxyTest, NavigateToURLAsync) {
   AutomationProxy* automation_object = automation();
   scoped_ptr<BrowserProxy> window(automation_object->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"cookie1.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("cookie1.html");
   GURL newurl = net::FilePathToFileURL(filename);
 
   ASSERT_TRUE(tab->NavigateToURLAsync(newurl));
   std::string value = WaitUntilCookieNonEmpty(tab.get(), newurl, "foo", 250,
                                               action_max_timeout_ms());
   ASSERT_STREQ("baz", value.c_str());
 }
 
 TEST_F(AutomationProxyTest, AcceleratorNewTab) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
@@ skipping 161 matching lines @@
 }
 
 TEST_F(AutomationProxyTest, DISABLED_ConstrainedWindowTest) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   tab.reset(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"constrained_files");
-  file_util::AppendToPath(&filename, L"constrained_window.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("constrained_files");
+  filename = filename.AppendASCII("constrained_window.html");
 
   ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
   int count;
   ASSERT_TRUE(tab->WaitForChildWindowCountToChange(0, &count, 5000));
 
   ASSERT_EQ(2, count);
 
   ConstrainedWindowProxy* cwindow = tab->GetConstrainedWindow(0);
   ASSERT_TRUE(cwindow);
@@ skipping 18 matching lines @@
 }
 
 TEST_F(AutomationProxyTest, CantEscapeByOnloadMoveto) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   tab.reset(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"constrained_files");
-  file_util::AppendToPath(&filename, L"constrained_window_onload_moveto.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("constrained_files");
+  filename = filename.AppendASCII("constrained_window_onload_moveto.html");
 
   ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
   int count;
   ASSERT_TRUE(tab->WaitForChildWindowCountToChange(0, &count, 5000));
 
   ASSERT_EQ(1, count);
 
   ConstrainedWindowProxy* cwindow = tab->GetConstrainedWindow(0);
   ASSERT_TRUE(cwindow);
@@ skipping 380 matching lines @@
   }
 };
 
 TEST_F(AutomationProxyTest5, TestLifetimeOfDomAutomationController) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   scoped_ptr<TabProxy> tab(window->GetTab(0));
   ASSERT_TRUE(tab.get());
 
-  std::wstring filename(test_data_directory_);
-  file_util::AppendToPath(&filename, L"dom_automation_test_with_popup.html");
+  FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+  filename = filename.AppendASCII("dom_automation_test_with_popup.html");
 
   tab->NavigateToURL(net::FilePathToFileURL(filename));
 
   // Allow some time for the popup to show up and close.
   Sleep(2000);
 
   std::wstring expected(L"string");
   std::wstring jscript = CreateJSString(L"\"" + expected + L"\"");
   std::wstring actual;
   ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual));
   ASSERT_STREQ(expected.c_str(), actual.c_str());
 }