String cleanup in sync code

chrome/browser/sync/engine/syncer_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_util.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
-#include "chrome/browser/sync/util/character_set_converters.h"
 #include "chrome/browser/sync/util/path_helpers.h"
 #include "chrome/browser/sync/util/sync_types.h"
 
 using syncable::BASE_VERSION;
 using syncable::BOOKMARK_FAVICON;
 using syncable::BOOKMARK_URL;
 using syncable::Blob;
 using syncable::CHANGES_VERSION;
 using syncable::CREATE;
 using syncable::CREATE_NEW_UPDATE_ITEM;
@@ skipping 293 matching lines @@
   local_entry->Put(SERVER_PARENT_ID, server_entry.parent_id());
   local_entry->PutServerName(name);
   local_entry->Put(SERVER_VERSION, server_entry.version());
   local_entry->Put(SERVER_CTIME,
       ServerTimeToClientTime(server_entry.ctime()));
   local_entry->Put(SERVER_MTIME,
       ServerTimeToClientTime(server_entry.mtime()));
   local_entry->Put(SERVER_IS_BOOKMARK_OBJECT, server_entry.has_bookmarkdata());
   local_entry->Put(SERVER_IS_DIR, server_entry.IsFolder());
   if (server_entry.has_singleton_tag()) {
-    PathString tag;
-    AppendUTF8ToPathString(server_entry.singleton_tag(), &tag);
+    const PathString& tag = server_entry.singleton_tag();
     local_entry->Put(SINGLETON_TAG, tag);
   }
   if (server_entry.has_bookmarkdata() && !server_entry.deleted()) {
     const SyncEntity::BookmarkData& bookmark = server_entry.bookmarkdata();
     if (bookmark.has_bookmark_url()) {
-      PathString url;
-      AppendUTF8ToPathString(bookmark.bookmark_url(), &url);
+      const PathString& url = bookmark.bookmark_url();
       local_entry->Put(SERVER_BOOKMARK_URL, url);
     }
     if (bookmark.has_bookmark_favicon()) {
       Blob favicon_blob;
       SyncerProtoUtil::CopyProtoBytesIntoBlob(bookmark.bookmark_favicon(),
                                               &favicon_blob);
       local_entry->Put(SERVER_BOOKMARK_FAVICON, favicon_blob);
     }
   }
   if (server_entry.has_position_in_parent()) {
@@ skipping 13 matching lines @@
 
 // static
 void SyncerUtil::ApplyExtendedAttributes(
     syncable::MutableEntry* local_entry,
     const SyncEntity& server_entry) {
   local_entry->DeleteAllExtendedAttributes(local_entry->write_transaction());
   if (server_entry.has_extended_attributes()) {
     const sync_pb::ExtendedAttributes & extended_attributes =
       server_entry.extended_attributes();
     for (int i = 0; i < extended_attributes.extendedattribute_size(); i++) {
-      PathString pathstring_key;
-      AppendUTF8ToPathString(
-          extended_attributes.extendedattribute(i).key(), &pathstring_key);
+      const PathString& pathstring_key =
+          extended_attributes.extendedattribute(i).key();
       ExtendedAttributeKey key(local_entry->Get(META_HANDLE), pathstring_key);
       MutableExtendedAttribute local_attribute(local_entry->write_transaction(),
           CREATE, key);
       SyncerProtoUtil::CopyProtoBytesIntoBlob(
           extended_attributes.extendedattribute(i).value(),
           local_attribute.mutable_value());
     }
   }
 }
 
@@ skipping 442 matching lines @@
 
     // |update_entry| is considered to be somewhere after |candidate|, so store
     // it as the upper bound.
     closest_sibling = candidate.Get(ID);
   }
 
   return closest_sibling;
 }
 
 }  // namespace browser_sync