summaryrefslogtreecommitdiffstats
path: root/chrome/common/sqlite_utils.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 19:21:41 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 19:21:41 +0000
commitfd401e556429b2cef6aaab95d9033069ddd790ac (patch)
tree457d63965d5a5e06691bb01ed436566aa99be76f /chrome/common/sqlite_utils.cc
parent448e475185329b14721e500152e6f4d64bff911e (diff)
downloadchromium_src-fd401e556429b2cef6aaab95d9033069ddd790ac.zip
chromium_src-fd401e556429b2cef6aaab95d9033069ddd790ac.tar.gz
chromium_src-fd401e556429b2cef6aaab95d9033069ddd790ac.tar.bz2
Ports TextDatabase and ExpireHistoryTest to use FilePath.
Patch by rohitrao@google.com http://codereview.chromium.org/40001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/sqlite_utils.cc')
-rw-r--r--chrome/common/sqlite_utils.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/sqlite_utils.cc b/chrome/common/sqlite_utils.cc
index 3f7b525..dc730de 100644
--- a/chrome/common/sqlite_utils.cc
+++ b/chrome/common/sqlite_utils.cc
@@ -10,7 +10,9 @@
int OpenSqliteDb(const FilePath& filepath, sqlite3** database) {
#if defined(OS_WIN)
- return sqlite3_open16(filepath.value().c_str(), database);
+ // We want the default encoding to always be UTF-8, so we use the
+ // 8-bit version of open().
+ return sqlite3_open(WideToUTF8(filepath.value()).c_str(), database);
#elif defined(OS_POSIX)
return sqlite3_open(filepath.value().c_str(), database);
#endif