summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/url_database_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/history/url_database_unittest.cc')
-rw-r--r--chrome/browser/history/url_database_unittest.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc
index 1ee1351..cb05019 100644
--- a/chrome/browser/history/url_database_unittest.cc
+++ b/chrome/browser/history/url_database_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/file_path.h"
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
@@ -40,11 +41,11 @@ class URLDatabaseTest : public testing::Test,
private:
// Test setup.
void SetUp() {
- PathService::Get(base::DIR_TEMP, &db_file_);
- db_file_.push_back(FilePath::kSeparators[0]);
- db_file_.append(L"URLTest.db");
+ FilePath temp_dir;
+ PathService::Get(base::DIR_TEMP, &temp_dir);
+ db_file_ = temp_dir.AppendASCII("URLTest.db");
- EXPECT_EQ(SQLITE_OK, sqlite3_open(WideToUTF8(db_file_).c_str(), &db_));
+ EXPECT_EQ(SQLITE_OK, OpenSqliteDb(db_file_, &db_));
statement_cache_ = new SqliteStatementCache(db_);
// Initialize the tables for this test.
@@ -67,7 +68,7 @@ class URLDatabaseTest : public testing::Test,
return *statement_cache_;
}
- std::wstring db_file_;
+ FilePath db_file_;
sqlite3* db_;
SqliteStatementCache* statement_cache_;
};