String cleanup in sync code

chrome/browser/sync/engine/syncer_unittest.cc

 // Copyright (c) 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 entry.
 //
 // Syncer unit tests. Unfortunately a lot of these tests
 // are outdated and need to be reworked and updated.
 
 #include <list>
 #include <map>
 #include <set>
 
 #include "base/at_exit.h"
 
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/engine/client_command_channel.h"
 #include "chrome/browser/sync/engine/conflict_resolution_view.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/get_commit_ids_command.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/process_updates_command.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncer_session.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/browser/sync/util/character_set_converters.h"
-#include "chrome/browser/sync/util/compat_file.h"
 #include "chrome/browser/sync/util/event_sys-inl.h"
 #include "chrome/test/sync/engine/mock_server_connection.h"
 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
 #include "chrome/test/sync/engine/test_id_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::map;
 using std::multimap;
 using std::set;
 using std::string;
@@ skipping 1343 matching lines @@
   }
 
   // Mix in a directory creation too for later.
   mock_server_->AddUpdateDirectory(2, 0, "dir_in_root", 10, 10);
   mock_server_->SetCommitTimeRename(i18nString);
   syncer_->SyncShare();
 
   // Verify it was correctly renamed.
   {
     ReadTransaction trans(dir, __FILE__, __LINE__);
-    PathString expectedFolder;
-    AppendUTF8ToPathString(i18nString, &expectedFolder);
-    AppendUTF8ToPathString("Folder", &expectedFolder);
+    PathString expectedFolder(i18nString);
+    expectedFolder.append("Folder");
     Entry entry_folder(&trans, GET_BY_PATH, expectedFolder);
     ASSERT_TRUE(entry_folder.good());
     PathString expected = expectedFolder + PathString(kPathSeparator);
-    AppendUTF8ToPathString(i18nString, &expected);
-    AppendUTF8ToPathString("new_entry", &expected);
+    expected.append(i18nString);
+    expected.append("new_entry");
 
     Entry entry_new(&trans, GET_BY_PATH, expected);
     ASSERT_TRUE(entry_new.good());
 
     // And that the unrelated directory creation worked without a rename.
     Entry new_dir(&trans, GET_BY_PATH, PSTR("dir_in_root"));
     EXPECT_TRUE(new_dir.good());
   }
 }
 
@@ skipping 3144 matching lines @@
   Add(low_id_);
   Add(high_id_);
   syncer_->SyncShare();
   ExpectLocalOrderIsByServerId();
 }
 
 const SyncerTest::CommitOrderingTest
 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
 
 }  // namespace browser_sync