String cleanup in sync code

chrome/test/sync/engine/mock_server_connection.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 file.
 //
 // Mock ServerConnectionManager class for use in client regression tests.
 
 #include "chrome/test/sync/engine/mock_server_connection.h"
 
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/util/character_set_converters.h"
@@ skipping 363 matching lines @@
                            name, version, sync_ts);
 }
 
 void MockConnectionManager::AddUpdateExtendedAttributes(SyncEntity* ent,
     PathString* xattr_key, syncable::Blob* xattr_value, int xattr_count) {
   sync_pb::ExtendedAttributes* mutable_extended_attributes =
       ent->mutable_extended_attributes();
   for (int i = 0; i < xattr_count; i++) {
     sync_pb::ExtendedAttributes_ExtendedAttribute* extended_attribute =
         mutable_extended_attributes->add_extendedattribute();
-    extended_attribute->set_key(static_cast<const string&>
-        (browser_sync::ToUTF8(xattr_key[i])));
+    extended_attribute->set_key(xattr_key[i]);
     SyncerProtoUtil::CopyBlobIntoProtoBytes(xattr_value[i],
         extended_attribute->mutable_value());
   }
 }
 
 SyncEntity* MockConnectionManager::GetMutableLastUpdate() {
   DCHECK(updates_.entries_size() > 0);
   return updates_.mutable_entries()->Mutable(updates_.entries_size() - 1);
 }
 
 const CommitMessage& MockConnectionManager::last_sent_commit() const {
   DCHECK(!commit_messages_.empty());
   return *commit_messages_.back();
 }
 
 void MockConnectionManager::ThrottleNextRequest(
     ThrottleRequestVisitor* visitor) {
   AutoLock lock(throttle_lock_);
   throttling_ = true;
   if (visitor)
     visitor->VisitAtomically();
 }