Final part of PathString cleanup.

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>
 #endif
 
-#include <string>
-
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "chrome/browser/sync/protocol/service_constants.h"
 #include "chrome/browser/sync/syncable/syncable-inl.h"
 #include "chrome/browser/sync/syncable/syncable_columns.h"
 #include "chrome/browser/sync/util/crypto_helpers.h"
 #include "chrome/browser/sync/util/path_helpers.h"
 #include "chrome/browser/sync/util/query_helpers.h"
 #include "third_party/sqlite/preprocessed/sqlite3.h"
 
@@ skipping 161 matching lines @@
     query.push_back(' ');
     query.append(column->spec);
   }
   query.push_back(')');
   return query;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DirectoryBackingStore implementation.
 
-DirectoryBackingStore::DirectoryBackingStore(const PathString& dir_name,
+DirectoryBackingStore::DirectoryBackingStore(const string& dir_name,
                                              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_);
@@ skipping 121 matching lines @@
     if (se.healthy()) {
       DropAllTables();
       se.set_result(CreateTables());
     }
   }
   if (SQLITE_DONE == se.result()) {
     {
       ScopedStatement statement(PrepareQuery(load_dbhandle_,
           "SELECT db_create_version, db_create_time FROM share_info"));
       CHECK(SQLITE_ROW == sqlite3_step(statement.get()));
-      PathString db_create_version;
+      string db_create_version;
       int db_create_time;
       GetColumn(statement.get(), 0, &db_create_version);
       GetColumn(statement.get(), 1, &db_create_time);
       statement.reset(0);
       LOG(INFO) << "DB created at " << db_create_time << " by version " <<
           db_create_version;
     }
     // COMMIT TRANSACTION rolls back on failure.
     if (SQLITE_DONE == Exec(load_dbhandle_, "COMMIT TRANSACTION"))
       return OPENED;
@@ skipping 23 matching lines @@
   }
 }
 
 void DirectoryBackingStore::LoadExtendedAttributes(
     ExtendedAttributes* xattrs_bucket) {
   ScopedStatement statement(PrepareQuery(load_dbhandle_,
       "SELECT metahandle, key, value FROM extended_attributes"));
   int step_result = sqlite3_step(statement.get());
   while (SQLITE_ROW == step_result) {
     int64 metahandle;
-    PathString path_string_key;
+    string path_string_key;
     ExtendedAttributeValue val;
     val.is_deleted = false;
     GetColumn(statement.get(), 0, &metahandle);
     GetColumn(statement.get(), 1, &path_string_key);
     GetColumn(statement.get(), 2, &(val.value));
     ExtendedAttributeKey key(metahandle, path_string_key);
     xattrs_bucket->insert(std::make_pair(key, val));
     step_result = sqlite3_step(statement.get());
   }
   CHECK(SQLITE_DONE == step_result);
@@ skipping 210 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