String cleanup in sync code

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"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable-inl.h"
 #include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/browser/sync/util/character_set_converters.h"
 
 using std::string;
 using std::stringstream;
 using syncable::BASE_VERSION;
 using syncable::CTIME;
 using syncable::ID;
 using syncable::IS_DEL;
 using syncable::IS_DIR;
 using syncable::IS_UNSYNCED;
 using syncable::MTIME;
@@ skipping 214 matching lines @@
 // static
 void SyncerProtoUtil::CopyBlobIntoProtoBytes(const syncable::Blob& blob,
                                              std::string* proto_bytes) {
   std::string blob_string(blob.begin(), blob.end());
   proto_bytes->swap(blob_string);
 }
 
 // static
 syncable::SyncName SyncerProtoUtil::NameFromSyncEntity(
     const SyncEntity& entry) {
-  SyncName result(PSTR(""));
-
-  AppendUTF8ToPathString(entry.name(), &result.value());
+  SyncName result(entry.name());
   if (entry.has_non_unique_name()) {
-    AppendUTF8ToPathString(entry.non_unique_name(),
-                           &result.non_unique_value());
-  } else {
-    result.non_unique_value() = result.value();
+    result.set_non_unique_value(entry.non_unique_name());
   }
   return result;
 }
 
 // static
 syncable::SyncName SyncerProtoUtil::NameFromCommitEntryResponse(
     const CommitResponse_EntryResponse& entry) {
-  SyncName result(PSTR(""));
-
-  AppendUTF8ToPathString(entry.name(), &result.value());
+  SyncName result(entry.name());
   if (entry.has_non_unique_name()) {
-    AppendUTF8ToPathString(entry.non_unique_name(),
-                           &result.non_unique_value());
-  } else {
-    result.non_unique_value() = result.value();
+    result.set_non_unique_value(entry.non_unique_name());
   }
   return result;
 }
 
 }  // namespace browser_sync