diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 19:37:03 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 19:37:03 +0000 |
| commit | 6c3bf032651d5f912775e0c8cd7e962454145ced (patch) | |
| tree | 88cf8b652147b9acf47aa81999f8652609890dde /sql | |
| parent | ce51317df2e23a717f95e56e1a9db1a7fb330a16 (diff) | |
| download | chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.zip chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.gz chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.bz2 | |
Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/, tools/, webkit/, win8/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/121123002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/connection.cc | 2 | ||||
| -rw-r--r-- | sql/statement.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/connection.cc b/sql/connection.cc index bfea605..f9f80c2 100644 --- a/sql/connection.cc +++ b/sql/connection.cc @@ -242,7 +242,7 @@ bool Connection::Open(const base::FilePath& path) { } #if defined(OS_WIN) - return OpenInternal(WideToUTF8(path.value()), RETRY_ON_POISON); + return OpenInternal(base::WideToUTF8(path.value()), RETRY_ON_POISON); #elif defined(OS_POSIX) return OpenInternal(path.value(), RETRY_ON_POISON); #endif diff --git a/sql/statement.cc b/sql/statement.cc index 985497e..7001d17 100644 --- a/sql/statement.cc +++ b/sql/statement.cc @@ -150,7 +150,7 @@ bool Statement::BindString(int col, const std::string& val) { } bool Statement::BindString16(int col, const base::string16& value) { - return BindString(col, UTF16ToUTF8(value)); + return BindString(col, base::UTF16ToUTF8(value)); } bool Statement::BindBlob(int col, const void* val, int val_len) { @@ -240,7 +240,7 @@ base::string16 Statement::ColumnString16(int col) const { return base::string16(); std::string s = ColumnString(col); - return !s.empty() ? UTF8ToUTF16(s) : base::string16(); + return !s.empty() ? base::UTF8ToUTF16(s) : base::string16(); } int Statement::ColumnByteLength(int col) const { |