String cleanup in sync code

chrome/browser/sync/util/user_settings.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 entry.
 //
 // This class isn't pretty. It's just a step better than globals, which is what
 // these were previously.
 
 #include "chrome/browser/sync/util/user_settings.h"
 
 #include "build/build_config.h"
@@ skipping 66 matching lines @@
       {
         // Scrape the 'shares' table to find the syncable DB.  'shares' had a
         // pair of string columns that mapped the username to the filename of
         // the sync data sqlite3 file.  Version 11 switched to a constant
         // filename, so here we read the string, copy the file to the new name,
         // delete the old one, and then drop the unused shares table.
         ScopedStatement share_query(PrepareQuery(handle,
             "SELECT share_name, file_name FROM shares"));
         int query_result = sqlite3_step(share_query.get());
         CHECK(SQLITE_ROW == query_result);
-        PathString share_name, file_name;
+        FilePath::StringType share_name, file_name;
         GetColumn(share_query.get(), 0, &share_name);
         GetColumn(share_query.get(), 1, &file_name);
 
         if (!file_util::Move(FilePath(file_name),
-            FilePath(DirectoryManager::GetSyncDataDatabaseFilename()))) {
+            DirectoryManager::GetSyncDataDatabaseFilename())) {
           LOG(WARNING) << "Unable to upgrade UserSettings from v10";
           return;
         }
       }
       ExecOrDie(handle, "DROP TABLE shares");
       ExecOrDie(handle, "UPDATE db_version SET version = 11");
     // FALL THROUGH
     case kCurrentDBVersion:
       // Nothing to migrate.
       return;
@@ skipping 18 matching lines @@
 }
 
 static void MakeClientIDTable(sqlite3* const dbhandle) {
   // Stores a single client ID value that can be used as the client id, if
   // there's not another such ID provided on the install.
   ExecOrDie(dbhandle, "CREATE TABLE client_id (id) ");
   ExecOrDie(dbhandle, "INSERT INTO client_id values ( ? )",
       Generate128BitRandomHexString());
 }
 
-bool UserSettings::Init(const PathString& settings_path) {
-  {  // Scope the handle
+bool UserSettings::Init(const FilePath& settings_path) {
+  {  // Scope the handle.
     ScopedDBHandle dbhandle(this);
     if (dbhandle_)
       sqlite3_close(dbhandle_);
-    CHECK(SQLITE_OK == SqliteOpen(settings_path.c_str(), &dbhandle_));
+    CHECK(SQLITE_OK == SqliteOpen(settings_path, &dbhandle_));
     // In the worst case scenario, the user may hibernate his computer during
     // one of our transactions.
     sqlite3_busy_timeout(dbhandle_, numeric_limits<int>::max());
 
     int sqlite_result = Exec(dbhandle.get(), "BEGIN EXCLUSIVE TRANSACTION");
     CHECK(SQLITE_DONE == sqlite_result);
     ScopedStatement table_query(PrepareQuery(dbhandle.get(),
         "select count(*) from sqlite_master where type = 'table'"
         " and name = 'db_version'"));
     int query_result = sqlite3_step(table_query.get());
@@ skipping 29 matching lines @@
       MakeSigninsTable(dbhandle.get());
       MakeCookiesTable(dbhandle.get());
       MakeSigninTypesTable(dbhandle.get());
       MakeClientIDTable(dbhandle.get());
     }
     ExecOrDie(dbhandle.get(), "COMMIT TRANSACTION");
   }
 #if defined(OS_WIN)
   // Do not index this file. Scanning can occur every time we close the file,
   // which causes long delays in SQLite's file locking.
-  const DWORD attrs = GetFileAttributes(settings_path.c_str());
+  const DWORD attrs = GetFileAttributes(settings_path.value().c_str());
   const BOOL attrs_set =
-    SetFileAttributes(settings_path.c_str(),
+    SetFileAttributes(settings_path.value().c_str(),
                       attrs | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
 #endif
   return true;
 }
 
 UserSettings::~UserSettings() {
   if (dbhandle_)
     sqlite3_close(dbhandle_);
 }
 
@@ skipping 142 matching lines @@
   ScopedStatement query(PrepareQuery(dbhandle.get(),
                                      "SELECT id FROM client_id"));
   int query_result = sqlite3_step(query.get());
   string client_id;
   if (query_result == SQLITE_ROW)
     GetColumn(query.get(), 0, &client_id);
   return client_id;
 }
 
 }  // namespace browser_sync