Final part of PathString cleanup.

chrome/browser/sync/engine/process_commit_response_command.cc

 // Copyright (c) 2006-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/engine/process_commit_response_command.h"
 
 #include <set>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 
 using syncable::ScopedDirLookup;
 using syncable::WriteTransaction;
 using syncable::MutableEntry;
 using syncable::Entry;
 
 using std::set;
+using std::string;
 using std::vector;
 
 using syncable::BASE_VERSION;
 using syncable::GET_BY_ID;
 using syncable::ID;
 using syncable::IS_DEL;
 using syncable::IS_DIR;
 using syncable::IS_UNAPPLIED_UPDATE;
 using syncable::IS_UNSYNCED;
 using syncable::PARENT_ID;
@@ skipping 302 matching lines @@
   }
   if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) {
     deleted_folders->insert(local_entry->Get(ID));
   }
 }
 
 void ProcessCommitResponseCommand::PerformCommitTimeNameAside(
     syncable::WriteTransaction* trans,
     const CommitResponse_EntryResponse& server_entry,
     syncable::MutableEntry* local_entry) {
-  PathString old_name = local_entry->Get(syncable::NON_UNIQUE_NAME);
+  string old_name = local_entry->Get(syncable::NON_UNIQUE_NAME);
   const string server_name =
       SyncerProtoUtil::NameFromCommitEntryResponse(server_entry);
 
   if (!server_name.empty() && old_name != server_name) {
     LOG(INFO) << "Server commit moved aside entry: " << old_name
               << " to new name " << server_name;
     // Should be safe since we're in a "commit lock."
     local_entry->Put(syncable::NON_UNIQUE_NAME, server_name);
   }
 }
 
 }  // namespace browser_sync