sync: Make BaseNode::GetTitle() return std::string.

chrome/browser/sync/engine/syncapi.cc

 // Copyright (c) 2011 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/syncapi.h"
 
 #include <algorithm>
 #include <bitset>
 #include <iomanip>
 #include <list>
@@ skipping 162 matching lines @@
                                     std::string* out) {
   *out = WideToUTF8(sync_api_name);
   if (IsNameServerIllegalAfterTrimming(*out))
     out->append(" ");
 }
 
 // In the reverse direction, if a server name matches the pattern of a
 // server-illegal name followed by one or more spaces, remove the trailing
 // space.
 static void ServerNameToSyncAPIName(const std::string& server_name,
-                                    std::wstring* out) {
+                                    std::string* out) {
   int length_to_copy = server_name.length();
   if (IsNameServerIllegalAfterTrimming(server_name) &&
       EndsWithSpace(server_name)) {
     --length_to_copy;
   }
-  if (!UTF8ToWide(server_name.c_str(), length_to_copy, out)) {
-    NOTREACHED() << "Could not convert server name from UTF8 to wide";
-  }
+  if (out)

[akalin, 2011/08/11 00:23:02]

better to CHECK(out)

[tfarina, 2011/08/11 00:25:41]

Done.

+    *out = std::string(server_name.c_str(), length_to_copy);
 }
 
 // Compare the values of two EntitySpecifics, accounting for encryption.
 static bool AreSpecificsEqual(const browser_sync::Cryptographer* cryptographer,
                               const sync_pb::EntitySpecifics& left,
                               const sync_pb::EntitySpecifics& right) {
   // Note that we can't compare encrypted strings directly as they are seeded
   // with a random value.
   std::string left_plaintext, right_plaintext;
   if (left.has_encrypted()) {
@@ skipping 160 matching lines @@
 }
 
 int64 BaseNode::GetModificationTime() const {
   return GetEntry()->Get(syncable::MTIME);
 }
 
 bool BaseNode::GetIsFolder() const {
   return GetEntry()->Get(syncable::IS_DIR);
 }
 
-std::wstring BaseNode::GetTitle() const {
-  std::wstring result;
+std::string BaseNode::GetTitle() const {
+  std::string result;
   // TODO(zea): refactor bookmarks to not need this functionality.
   if (syncable::BOOKMARKS == GetModelType() &&
       GetEntry()->Get(syncable::SPECIFICS).has_encrypted()) {
     // Special case for legacy bookmarks dealing with encryption.
     ServerNameToSyncAPIName(GetBookmarkSpecifics().title(), &result);
   } else {
     ServerNameToSyncAPIName(GetEntry()->Get(syncable::NON_UNIQUE_NAME),
-        &result);
+                            &result);
   }
   return result;
 }
 
 GURL BaseNode::GetURL() const {
   return GURL(GetBookmarkSpecifics().url());
 }
 
 int64 BaseNode::GetPredecessorId() const {
   syncable::Id id_string = GetEntry()->Get(syncable::PREV_ID);
@@ skipping 16 matching lines @@
       dir->GetFirstChildId(trans, GetEntry()->Get(syncable::ID));
   if (id_string.IsRoot())
     return kInvalidId;
   return IdToMetahandle(GetTransaction()->GetWrappedTrans(), id_string);
 }
 
 DictionaryValue* BaseNode::GetSummaryAsValue() const {
   DictionaryValue* node_info = new DictionaryValue();
   node_info->SetString("id", base::Int64ToString(GetId()));
   node_info->SetBoolean("isFolder", GetIsFolder());
-  // TODO(akalin): Add a std::string accessor for the title.
-  node_info->SetString("title", WideToUTF8(GetTitle()));
+  node_info->SetString("title", GetTitle());
   node_info->Set("type", ModelTypeToValue(GetModelType()));
   return node_info;
 }
 
 DictionaryValue* BaseNode::GetDetailsAsValue() const {
   DictionaryValue* node_info = GetSummaryAsValue();
   // TODO(akalin): Return time in a better format.
   node_info->SetString("modificationTime",
                        base::Int64ToString(GetModificationTime()));
   node_info->SetString("parentId", base::Int64ToString(GetParentId()));
@@ skipping 2644 matching lines @@
 void SyncManager::TriggerOnIncomingNotificationForTest(
     const syncable::ModelTypeBitSet& model_types) {
   syncable::ModelTypePayloadMap model_types_with_payloads =
       syncable::ModelTypePayloadMapFromBitSet(model_types,
           std::string());
 
   data_->OnIncomingNotification(model_types_with_payloads);
 }
 
 }  // namespace sync_api