String cleanup in sync code

chrome/browser/sync/syncable/directory_backing_store.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/syncable/directory_backing_store.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
@@ skipping 53 matching lines @@
 // this character is passed in as a third character to the like function.
 // See: http://www.sqlite.org/lang_expr.html
 static void PathNameMatch16WithEscape(sqlite3_context* context,
                                       int argc, sqlite3_value** argv) {
   // Never seen this called, but just in case.
   LOG(FATAL) << "PathNameMatch16WithEscape() not implemented";
 }
 #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));
 }
 
 // Replace the LIKE operator with our own implementation that does file spec
 // matching like "*.txt".
 static void RegisterPathNameMatch(sqlite3* dbhandle) {
   // We only register this on Windows. We use the normal sqlite
   // matching function on mac/linux.
   // note that the function PathNameMatch() does a simple ==
@@ skipping 150 matching lines @@
     query.append(column->spec);
   }
   query.push_back(')');
   return query;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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),
       backing_filepath_(backing_filepath) {
 }
 
 DirectoryBackingStore::~DirectoryBackingStore() {
   if (NULL != load_dbhandle_) {
     sqlite3_close(load_dbhandle_);
     load_dbhandle_ = NULL;
   }
   if (NULL != save_dbhandle_) {
     sqlite3_close(save_dbhandle_);
     save_dbhandle_ = NULL;
   }
 }
 
 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);
     return true;
   }
   return false;
 }
 
 DirOpenResult DirectoryBackingStore::Load(MetahandlesIndex* entry_bucket,
     ExtendedAttributes* xattrs_bucket,
@@ skipping 375 matching lines @@
 
 sqlite3* DirectoryBackingStore::LazyGetSaveHandle() {
   if (!save_dbhandle_ && !OpenAndConfigureHandleHelper(&save_dbhandle_)) {
     DCHECK(FALSE) << "Unable to open handle for saving";
     return NULL;
   }
   return save_dbhandle_;
 }
 
 }  // namespace syncable