Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,…

sql/statement.cc

 // Copyright (c) 2012 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 "sql/statement.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/sqlite/sqlite3.h"
@@ skipping 132 matching lines @@
     return false;
 
   return CheckOk(sqlite3_bind_text(ref_->stmt(),
                                    col + 1,
                                    val.data(),
                                    val.size(),
                                    SQLITE_TRANSIENT));
 }
 
 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) {
   DCHECK(!stepped_);
   if (!is_valid())
     return false;
 
   return CheckOk(
       sqlite3_bind_blob(ref_->stmt(), col + 1, val, val_len, SQLITE_TRANSIENT));
 }
@@ skipping 69 matching lines @@
   if (str && len > 0)
     result.assign(str, len);
   return result;
 }
 
 base::string16 Statement::ColumnString16(int col) const {
   if (!CheckValid())
     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 {
   if (!CheckValid())
     return 0;
 
   return sqlite3_column_bytes(ref_->stmt(), col);
 }
 
 const void* Statement::ColumnBlob(int col) const {
@@ skipping 66 matching lines @@
 
 int Statement::CheckError(int err) {
   // Please don't add DCHECKs here, OnSqliteError() already has them.
   succeeded_ = (err == SQLITE_OK || err == SQLITE_ROW || err == SQLITE_DONE);
   if (!succeeded_ && ref_.get() && ref_->connection())
     return ref_->connection()->OnSqliteError(err, this, NULL);
   return err;
 }
 
 }  // namespace sql