Get rid of kPathSeparator on windows.

chrome/browser/session_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_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_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"
 
 namespace {
 
 class SessionRestoreUITest : public UITest {
  protected:
   SessionRestoreUITest() : UITest() {
-    std::wstring path_prefix = test_data_directory_;
-    file_util::AppendToPath(&path_prefix, L"session_history");
-    path_prefix += file_util::kPathSeparator;
+    FilePath path_prefix = FilePath::FromWStringHack(test_data_directory_);
+    path_prefix = path_prefix.Append(FILE_PATH_LITERAL("session_history"))
+        .Append(FilePath::StringType(&FilePath::kSeparators[0], 1));
 
-    url1 = net::FilePathToFileURL(path_prefix + L"bot1.html");
-    url2 = net::FilePathToFileURL(path_prefix + L"bot2.html");
-    url3 = net::FilePathToFileURL(path_prefix + L"bot3.html");
+    url1 = net::FilePathToFileURL(
+        path_prefix.Append(FILE_PATH_LITERAL("bot1.html")));
+    url2 = net::FilePathToFileURL(
+        path_prefix.Append(FILE_PATH_LITERAL("bot2.html")));
+    url3 = net::FilePathToFileURL(
+        path_prefix.Append(FILE_PATH_LITERAL("bot3.html")));
   }
 
   virtual void QuitBrowserAndRestore() {
     UITest::TearDown();
 
     clear_profile_ = false;
 
     CommandLine::AppendSwitch(&launch_arguments_,
                               switches::kRestoreLastSession);
     UITest::SetUp();
@@ skipping 378 matching lines @@
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(restored_tab_count - 2));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
   tab_proxy.reset(browser_proxy->GetTab(restored_tab_count - 1));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
 
   ASSERT_EQ(expected_process_count, GetBrowserProcessCount());
 }