Monster FilePath patch!

chrome/browser/tab_restore_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/command_line.h"
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 
 class TabRestoreUITest : public UITest {
  public:
   TabRestoreUITest() : UITest() {
-    std::wstring path_prefix = test_data_directory_;
-    file_util::AppendToPath(&path_prefix, L"session_history");
-    path_prefix += FilePath::kSeparators[0];
-    url1_ = net::FilePathToFileURL(path_prefix + L"bot1.html");
-    url2_ = net::FilePathToFileURL(path_prefix + L"bot2.html");
+    FilePath path_prefix(FilePath::FromWStringHack(test_data_directory_));
+    path_prefix = path_prefix.AppendASCII("session_history");
+    url1_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html"));
+    url2_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html"));
   }
 
  protected:
   void RestoreTab() {
     int tab_count;
 
     // Reset browser_proxy to new window.
     scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
     ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
     ASSERT_GT(tab_count, 0);
@@ skipping 230 matching lines @@
   GURL url;
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   ASSERT_TRUE(url == url1_);
 
   restored_tab_proxy.reset(
         browser_proxy->GetTab(initial_tab_count + 1));
   ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   ASSERT_TRUE(url == url2_);
 }