String cleanup in sync code

chrome/browser/sync/syncable/directory_backing_store.cc

Index: chrome/browser/sync/syncable/directory_backing_store.cc
===================================================================
--- chrome/browser/sync/syncable/directory_backing_store.cc	(revision 30948)
+++ chrome/browser/sync/syncable/directory_backing_store.cc	(working copy)
@@ -71,11 +71,7 @@
 #endif
 
 static void RegisterPathNameCollate(sqlite3* dbhandle) {
-#if defined(OS_WIN)
-  const int collate = SQLITE_UTF16;
-#else
   const int collate = SQLITE_UTF8;
-#endif
   CHECK(SQLITE_OK == sqlite3_create_collation(dbhandle, "PATHNAME", collate,
       NULL, &ComparePathNames16));
 }
@@ -246,7 +242,7 @@
 // DirectoryBackingStore implementation.
 
 DirectoryBackingStore::DirectoryBackingStore(const PathString& dir_name,
-    const PathString& backing_filepath)
+                                             const FilePath& backing_filepath)
     : load_dbhandle_(NULL),
       save_dbhandle_(NULL),
       dir_name_(dir_name),
@@ -266,7 +262,7 @@
 
 bool DirectoryBackingStore::OpenAndConfigureHandleHelper(
     sqlite3** handle) const {
-  if (SQLITE_OK == SqliteOpen(backing_filepath_.c_str(), handle)) {
+  if (SQLITE_OK == SqliteOpen(backing_filepath_, handle)) {
     sqlite3_busy_timeout(*handle, kDirectoryBackingStoreBusyTimeoutMs);
     RegisterPathNameCollate(*handle);
     RegisterPathNameMatch(*handle);