Final part of PathString cleanup.

chrome/browser/sync/engine/syncer_proto_util.cc

 // Copyright (c) 2006-2008 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/syncer_proto_util.h"
 
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/protocol/service_constants.h"
@@ skipping 170 matching lines @@
 
   if (local_entry.Get(IS_DEL) && server_entry.deleted())
     return true;
   if (!ClientAndServerTimeMatch(local_entry.Get(CTIME), server_entry.ctime())) {
     LOG(WARNING) << "ctime mismatch";
     return false;
   }
 
   // These checks are somewhat prolix, but they're easier to debug than a big
   // boolean statement.
-  PathString client_name = local_entry.Get(syncable::NON_UNIQUE_NAME);
+  string client_name = local_entry.Get(syncable::NON_UNIQUE_NAME);
   if (client_name != name) {
     LOG(WARNING) << "Client name mismatch";
     return false;
   }
   if (local_entry.Get(PARENT_ID) != server_entry.parent_id()) {
     LOG(WARNING) << "Parent ID mismatch";
     return false;
   }
   if (local_entry.Get(IS_DIR) != server_entry.IsFolder()) {
     LOG(WARNING) << "Dir field mismatch";
@@ skipping 51 matching lines @@
     const CommitResponse_EntryResponse& entry) {
 
   if (entry.has_non_unique_name()) {
       return entry.non_unique_name();
   }
 
   return entry.name();
 }
 
 }  // namespace browser_sync