Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1724)

Unified Diff: chrome/browser/history/starred_url_database_unittest.cc

Issue 12893: Get rid of kPathSeparator on windows. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/download/save_page_uitest.cc ('k') | chrome/browser/history/url_database_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/starred_url_database_unittest.cc
===================================================================
--- chrome/browser/history/starred_url_database_unittest.cc (revision 6271)
+++ chrome/browser/history/starred_url_database_unittest.cc (working copy)
@@ -66,18 +66,19 @@
// 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.
@@ -99,7 +100,7 @@
return *statement_cache_;
}
- std::wstring db_file_;
+ FilePath db_file_;
sqlite3* db_;
SqliteStatementCache* statement_cache_;
};
« no previous file with comments | « chrome/browser/download/save_page_uitest.cc ('k') | chrome/browser/history/url_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698