String cleanup in sync code

chrome/browser/sync/util/query_helpers.cc

 // Copyright (c) 2009 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 "chrome/browser/sync/util/query_helpers.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "chrome/browser/sync/util/sync_types.h"
+#include "chrome/common/sqlite_utils.h"
 
 using std::numeric_limits;
 using std::string;
 using std::vector;
 
 sqlite3_stmt* PrepareQuery(sqlite3* dbhandle, const char* query) {
   sqlite3_stmt* statement = NULL;
   const char* query_tail;
   if (SQLITE_OK != sqlite3_prepare(dbhandle, query,
                                    CountBytes(query), &statement,
@@ skipping 22 matching lines @@
 // Finalizes (deletes) the query before returning.
 int Exec(sqlite3* dbhandle, const char* query, sqlite3_stmt* statement) {
   int result;
   do {
     result = sqlite3_step(statement);
   } while (SQLITE_ROW == result);
   int finalize_result = sqlite3_finalize(statement);
   return SQLITE_OK == finalize_result ? result : finalize_result;
 }
 
-int SqliteOpen(PathString filename, sqlite3** db) {
-  int result =
-#if PATHSTRING_IS_STD_STRING
-  sqlite3_open
-#else
-  sqlite3_open16
-#endif
-  (filename.c_str(), db);
-  LOG_IF(ERROR, SQLITE_OK != result) << "Error opening " << filename << ": "
+int SqliteOpen(const FilePath& filename, sqlite3** db) {
+  int result = OpenSqliteDb(filename, db);
+  LOG_IF(ERROR, SQLITE_OK != result) << "Error opening "
+                                     << filename.value() << ": "
                                      << result;
 #if defined(OS_WIN)
   if (SQLITE_OK == result) {
     // Make sure we mark the db file as not indexed so since if any other app
     // opens it, it can break our db locking.
-    DWORD attrs = GetFileAttributes(filename.c_str());
+    DWORD attrs = GetFileAttributesW(filename.value().c_str());
     if (FILE_ATTRIBUTE_NORMAL == attrs)
       attrs = FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
     else
       attrs = attrs | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
-    SetFileAttributes(filename.c_str(), attrs);
+    SetFileAttributesW(filename.value().c_str(), attrs);
   }
 #endif  // defined(OS_WIN)
   // Be patient as we set pragmas.
   sqlite3_busy_timeout(*db, numeric_limits<int>::max());
 #if !defined(DISABLE_SQLITE_FULL_FSYNC)
   ExecOrDie(*db, "PRAGMA fullfsync = 1");
 #endif  // !defined(DISABLE_SQLITE_FULL_FSYNC)
   ExecOrDie(*db, "PRAGMA synchronous = 2");
   sqlite3_busy_timeout(*db, 0);
   return SQLITE_OK;
 }
 
-#if !PATHSTRING_IS_STD_STRING
-sqlite3_stmt* BindArg(sqlite3_stmt* statement, const PathString& s, int index) {
-  if (NULL == statement)
-    return statement;
-  CHECK(SQLITE_OK == sqlite3_bind_text16(statement, index, s.data(),
-    CountBytes(s), SQLITE_TRANSIENT));
-  return statement;
-}
-
-sqlite3_stmt* BindArg(sqlite3_stmt* statement, const PathChar* s, int index) {
-  if (NULL == statement)
-    return statement;
-  CHECK(SQLITE_OK == sqlite3_bind_text16(statement,
-                                         index,
-                                         s,
-                                         -1,  // -1 means s is zero-terminated
-                                         SQLITE_TRANSIENT));
-  return statement;
-}
-#endif  // !PATHSTRING_IS_STD_STRING
-
 sqlite3_stmt* BindArg(sqlite3_stmt* statement, const string& s, int index) {
   if (NULL == statement)
     return statement;
   CHECK(SQLITE_OK == sqlite3_bind_text(statement,
                                        index,
                                        s.data(),
                                        CountBytes(s),
                                        SQLITE_TRANSIENT));
   return statement;
 }
@@ skipping 51 matching lines @@
   return statement;
 }
 
 sqlite3_stmt* BindArg(sqlite3_stmt* statement, SqliteNullType, int index) {
   if (NULL == statement)
     return statement;
   CHECK(SQLITE_OK == sqlite3_bind_null(statement, index));
   return statement;
 }
 
-#if !PATHSTRING_IS_STD_STRING
-void GetColumn(sqlite3_stmt* statement, int index, PathString* value) {
+void GetColumn(sqlite3_stmt* statement, int index, string16* value) {
   if (sqlite3_column_type(statement, index) == SQLITE_NULL) {
     value->clear();
   } else {
     value->assign(
-        static_cast<const PathChar*>(sqlite3_column_text16(statement, index)),
-        sqlite3_column_bytes16(statement, index) / sizeof(PathChar));
+        static_cast<const char16*>(sqlite3_column_text16(statement, index)),
+        sqlite3_column_bytes16(statement, index) / sizeof(char16));
   }
 }
-#endif  // !PATHSTRING_IS_STD_STRING
 
 void GetColumn(sqlite3_stmt* statement, int index, string* value) {
   if (sqlite3_column_type(statement, index) == SQLITE_NULL) {
     value->clear();
   } else {
     value->assign(
         reinterpret_cast<const char*>(sqlite3_column_text(statement, index)),
         sqlite3_column_bytes(statement, index));
   }
 }
@@ skipping 69 matching lines @@
   string result;
   result.reserve(in.size() / 2);
   for (string::const_iterator i = in.begin(); i != in.end(); ++i) {
     unsigned int c = *i - 'A';
     if (++i != in.end())
       c = c | (static_cast<unsigned char>(*i - 'A') << 4);
     result.push_back(c);
   }
   return result;
 }