Get rid of kPathSeparator on windows.

chrome/browser/history/starred_url_database_unittest.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 <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/history/history.h"
@@ skipping 48 matching lines @@
   }
 
   bool EnsureStarredIntegrity() {
     return StarredURLDatabase::EnsureStarredIntegrity();
   }
 
  private:
   // Test setup.
   void SetUp() {
     PathService::Get(base::DIR_TEMP, &db_file_);
-    db_file_.push_back(file_util::kPathSeparator);
-    db_file_.append(L"VisitTest.db");
+    db_file_ = db_file_.Append(FILE_PATH_LITERAL("VisitTest.db"));
     file_util::Delete(db_file_, false);
 
     // Copy db file over that contains starred table.
-    std::wstring old_history_path;
+    FilePath old_history_path;
     PathService::Get(chrome::DIR_TEST_DATA, &old_history_path);
-    file_util::AppendToPath(&old_history_path, L"bookmarks");
-    file_util::AppendToPath(&old_history_path, L"History_with_empty_starred");
+    old_history_path = old_history_path.Append(FILE_PATH_LITERAL("bookmarks"));
+    old_history_path = old_history_path.Append(
+        FILE_PATH_LITERAL("History_with_empty_starred"));
     file_util::CopyFile(old_history_path, db_file_);
 
-    EXPECT_EQ(SQLITE_OK, sqlite3_open(WideToUTF8(db_file_).c_str(), &db_));
+    EXPECT_EQ(SQLITE_OK, 
+        sqlite3_open(WideToUTF8(db_file_.ToWStringHack()).c_str(), &db_));
     statement_cache_ = new SqliteStatementCache(db_);
 
     // Initialize the tables for this test.
     CreateURLTable(false);
     CreateMainURLIndex();
     EnsureStarredIntegrity();
   }
   void TearDown() {
     delete statement_cache_;
     sqlite3_close(db_);
     file_util::Delete(db_file_, false);
   }
 
   // Provided for URL/StarredURLDatabase.
   virtual sqlite3* GetDB() {
     return db_;
   }
   virtual SqliteStatementCache& GetStatementCache() {
     return *statement_cache_;
   }
 
-  std::wstring db_file_;
+  FilePath db_file_;
   sqlite3* db_;
   SqliteStatementCache* statement_cache_;
 };
 
 //-----------------------------------------------------------------------------
 
 TEST_F(StarredURLDatabaseTest, FixOrphanedGroup) {
   const size_t initial_count = GetStarredEntryCount();
 
   // Create a group that isn't parented to the other/bookmark folders.
@@ skipping 170 matching lines @@
 
   // Fix up the table.
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // The entry we just created should have been nuked.
   ASSERT_EQ(initial_count, GetStarredEntryCount());
 }
 
 }  // namespace history