String cleanup in sync code

chrome/browser/sync/util/query_helpers.h

 // 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.
 //
 // Typesafe composition of SQL query strings.
 
 #ifndef CHROME_BROWSER_SYNC_UTIL_QUERY_HELPERS_H_
 #define CHROME_BROWSER_SYNC_UTIL_QUERY_HELPERS_H_
 
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/logging.h"
+#include "base/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/util/sync_types.h"
 #include "third_party/sqlite/preprocessed/sqlite3.h"
 
 enum SqliteNullType {
   SQLITE_NULL_VALUE
 };
 
-int SqliteOpen(PathString filename, sqlite3** ppDb);
+int SqliteOpen(const FilePath& filename, sqlite3** ppDb);
 
 sqlite3_stmt* PrepareQuery(sqlite3* dbhandle, const char* query);
-#if !PATHSTRING_IS_STD_STRING
-sqlite3_stmt* BindArg(sqlite3_stmt*, const PathString&, int index);
-sqlite3_stmt* BindArg(sqlite3_stmt*, const PathChar*, int index);
-#endif
 sqlite3_stmt* BindArg(sqlite3_stmt*, const std::string&, int index);
 sqlite3_stmt* BindArg(sqlite3_stmt*, const char*, int index);
 sqlite3_stmt* BindArg(sqlite3_stmt*, int32, int index);
 sqlite3_stmt* BindArg(sqlite3_stmt*, int64, int index);
 sqlite3_stmt* BindArg(sqlite3_stmt*, double, int index);
 sqlite3_stmt* BindArg(sqlite3_stmt*, bool, int index);
 sqlite3_stmt* BindArg(sqlite3_stmt*, const std::vector<uint8>&, int index);
 sqlite3_stmt* BindArg(sqlite3_stmt*, SqliteNullType, int index);
 
-#if !PATHSTRING_IS_STD_STRING
-void GetColumn(sqlite3_stmt*, int index, PathString* value);
-#endif
+void GetColumn(sqlite3_stmt*, int index, string16* value);
 void GetColumn(sqlite3_stmt*, int index, std::string* value);
 void GetColumn(sqlite3_stmt*, int index, int32* value);
 void GetColumn(sqlite3_stmt*, int index, int64* value);
 void GetColumn(sqlite3_stmt*, int index, double* value);
 void GetColumn(sqlite3_stmt*, int index, bool* value);
 void GetColumn(sqlite3_stmt*, int index, std::vector<uint8>* value);
 
 bool DoesTableExist(sqlite3* dbhandle, const std::string& tablename);
 
 // Prepares a query with a WHERE clause that filters the values by the items
@@ skipping 631 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ScopedStatementResetter);
 };
 
 // Useful for encoding any sequence of bytes into a string that can be used in
 // a table name. Kind of like hex encoding, except that A is zero and P is 15.
 std::string APEncode(const std::string& in);
 std::string APDecode(const std::string& in);
 
 #endif  // CHROME_BROWSER_SYNC_UTIL_QUERY_HELPERS_H_