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

chrome/browser/sync/glue/bookmark_change_processor.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/glue/bookmark_change_processor.h"
 
 #include <stack>
 #include <vector>
 
 #include "base/string16.h"
@@ skipping 456 matching lines @@
   } else {
     // URL and is_folder are not expected to change.
     // TODO(ncarter): Determine if such changes should be legal or not.
     DCHECK_EQ(src->GetIsFolder(), dst->is_folder());
 
     // Handle reparenting and/or repositioning.
     model->Move(dst, parent, index);
 
     if (!src->GetIsFolder())
       model->SetURL(dst, src->GetURL());
-    model->SetTitle(dst, WideToUTF16Hack(src->GetTitle()));
+    model->SetTitle(dst, UTF8ToUTF16(src->GetTitle()));
 
     SetBookmarkFavicon(src, dst, model);
   }
 
   return dst;
 }
 
 // static
 // Creates a bookmark node under the given parent node from the given sync
 // node. Returns the newly created node.
 const BookmarkNode* BookmarkChangeProcessor::CreateBookmarkNode(
     sync_api::BaseNode* sync_node,
     const BookmarkNode* parent,
     BookmarkModel* model,
     int index) {
   DCHECK(parent);
   DCHECK(index >= 0 && index <= parent->child_count());
 
   const BookmarkNode* node;
   if (sync_node->GetIsFolder()) {
     node = model->AddFolder(parent, index,
-                            WideToUTF16Hack(sync_node->GetTitle()));
+                            UTF8ToUTF16(sync_node->GetTitle()));
   } else {
     node = model->AddURL(parent, index,
-                         WideToUTF16Hack(sync_node->GetTitle()),
+                         UTF8ToUTF16(sync_node->GetTitle()),
                          sync_node->GetURL());
     SetBookmarkFavicon(sync_node, node, model);
   }
   return node;
 }
 
 // static
 // Sets the favicon of the given bookmark node from the given sync node.
 bool BookmarkChangeProcessor::SetBookmarkFavicon(
     sync_api::BaseNode* sync_node,
@@ skipping 40 matching lines @@
     const BookmarkNode* bookmark_node,
     BookmarkModel* model,
     sync_api::WriteNode* sync_node) {
   std::vector<unsigned char> favicon_bytes;
   EncodeFavicon(bookmark_node, model, &favicon_bytes);
   if (!favicon_bytes.empty())
     sync_node->SetFaviconBytes(favicon_bytes);
 }
 
 }  // namespace browser_sync