String cleanup in sync code

chrome/browser/sync/engine/apply_updates_command_unittest.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/apply_updates_command.h"
 #include "chrome/browser/sync/engine/sync_cycle_state.h"
 #include "chrome/browser/sync/engine/sync_process_state.h"
 #include "chrome/browser/sync/engine/syncer_session.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
-#include "chrome/browser/sync/util/character_set_converters.h"
 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::string;
 using syncable::ScopedDirLookup;
 using syncable::WriteTransaction;
 using syncable::ReadTransaction;
 using syncable::MutableEntry;
 using syncable::Entry;
 using syncable::Id;
@@ skipping 16 matching lines @@
  protected:
   // Create a new unapplied update.
   void CreateUnappliedNewItemWithParent(const string& item_id,
                                         const string& parent_id) {
     ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
     ASSERT_TRUE(dir.good());
     WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__);
     MutableEntry entry(&trans, syncable::CREATE_NEW_UPDATE_ITEM,
         Id::CreateFromServerId(item_id));
     ASSERT_TRUE(entry.good());
-    PathString name;
-    AppendUTF8ToPathString(item_id, &name);
     entry.Put(syncable::SERVER_VERSION, next_revision_++);
     entry.Put(syncable::IS_UNAPPLIED_UPDATE, true);
-    entry.Put(syncable::SERVER_NAME, name);
-    entry.Put(syncable::SERVER_NON_UNIQUE_NAME, name);
+    entry.Put(syncable::SERVER_NAME, item_id);
+    entry.Put(syncable::SERVER_NON_UNIQUE_NAME, item_id);
     entry.Put(syncable::SERVER_PARENT_ID, Id::CreateFromServerId(parent_id));
     entry.Put(syncable::SERVER_IS_DIR, true);
   }
 
   TestDirectorySetterUpper syncdb_;
   ApplyUpdatesCommand apply_updates_command_;
 
  private:
   int64 next_revision_;
   DISALLOW_COPY_AND_ASSIGN(ApplyUpdatesCommandTest);
@@ skipping 91 matching lines @@
       << "All updates should have been attempted";
   EXPECT_EQ(2, process_state.ConflictingItemsSize())
       << "The updates with unknown ancestors should be in conflict";
   EXPECT_EQ(0, process_state.BlockedItemsSize())
       << "Blocked items shouldn't be possible under any circumstances";
   EXPECT_EQ(4, cycle_state.SuccessfullyAppliedUpdateCount())
       << "The updates with known ancestors should be successfully applied";
 }
 
 }  // namespace browser_sync