commit 0d1858f87ad39776d3bccd0ec75731daf232e0d3
author Andrew Top <aabtop@google.com> Wed May 15 22:01:47 2019 -0700
committer Andrew Top <aabtop@google.com> Wed May 15 22:01:47 2019 -0700
tree 9924cfbd13436a16a58dfd896698080b4096315d
parent 61a8495e1e0485bd40f613004bf29f8a925ab37c

Import Cobalt 19.master.0.205881

src/sql/statement.cc

diff --git a/src/sql/statement.cc b/src/sql/statement.cc
index 5068cc7..6da6061 100644
--- a/src/sql/statement.cc
+++ b/src/sql/statement.cc
@@ -9,8 +9,8 @@
 #include "sql/statement.h"
 
 #include "base/logging.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace sql {
@@ -139,8 +139,8 @@
                                    SQLITE_TRANSIENT));
 }
 
-bool Statement::BindString16(int col, const string16& value) {
-  return BindString(col, UTF16ToUTF8(value));
+bool Statement::BindString16(int col, const base::string16& value) {
+  return BindString(col, base::UTF16ToUTF8(value));
 }
 
 bool Statement::BindBlob(int col, const void* val, int val_len) {
@@ -171,7 +171,7 @@
 
 ColType Statement::DeclaredColumnType(int col) const {
   std::string column_type(sqlite3_column_decltype(ref_->stmt(), col));
-  StringToLowerASCII(&column_type);
+  base::ToLowerASCII(base::StringPiece(column_type));
 
   if (column_type == "integer")
     return COLUMN_TYPE_INTEGER;
@@ -232,12 +232,12 @@
   return result;
 }
 
-string16 Statement::ColumnString16(int col) const {
+base::string16 Statement::ColumnString16(int col) const {
   if (!CheckValid())
-    return string16();
+    return base::string16();
 
   std::string s = ColumnString(col);
-  return !s.empty() ? UTF8ToUTF16(s) : string16();
+  return !s.empty() ? base::UTF8ToUTF16(s) : base::string16();
 }
 
 int Statement::ColumnByteLength(int col) const {
@@ -268,16 +268,16 @@
   return true;
 }
 
-bool Statement::ColumnBlobAsString16(int col, string16* val) const {
+bool Statement::ColumnBlobAsString16(int col, base::string16* val) const {
   if (!CheckValid())
     return false;
 
   const void* data = ColumnBlob(col);
-  size_t len = ColumnByteLength(col) / sizeof(char16);
+  size_t len = ColumnByteLength(col) / sizeof(base::char16);
   val->resize(len);
   if (val->size() != len)
     return false;
-  val->assign(reinterpret_cast<const char16*>(data), len);
+  val->assign(reinterpret_cast<const base::char16*>(data), len);
   return true;
 }