Remove wstrings from bookmarks, part 17.

This converts lots of (wstring) GetTitle()s to (string16) GetTitleAsString16().
Soon, I'll be able to delete the former, and rename the latter (s/AsString16//).

BUG=23581
TEST=builds and passes tests

Review URL: http://codereview.chromium.org/3226004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57800 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 3 deletions

diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 03cce0b..6fcdf69 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -51,7 +51,7 @@ void BookmarkChangeProcessor::UpdateSyncNodeProperties(
     const BookmarkNode* src, BookmarkModel* model, sync_api::WriteNode* dst) {
   // Set the properties of the item.
   dst->SetIsFolder(src->is_folder());
-  dst->SetTitle(src->GetTitle());
+  dst->SetTitle(UTF16ToWideHack(src->GetTitleAsString16()));
   if (!src->is_folder())
     dst->SetURL(src->GetURL());
   SetSyncNodeFavicon(src, model, dst);
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 6d9d96aa..b52932e 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -54,7 +54,8 @@ class BookmarkComparer {
     if (node1->is_folder() != node2->is_folder())
       return node1->is_folder();
 
-    int result = node1->GetTitle().compare(node2->GetTitle());
+    int result =
+        node1->GetTitleAsString16().compare(node2->GetTitleAsString16());
     if (result != 0)
       return result < 0;
 
@@ -257,7 +258,7 @@ bool BookmarkModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
 
 bool BookmarkModelAssociator::NodesMatch(const BookmarkNode* bookmark,
     const sync_api::BaseNode* sync_node) const {
-  if (bookmark->GetTitle() != sync_node->GetTitle())
+  if (bookmark->GetTitleAsString16() != WideToUTF16Hack(sync_node->GetTitle()))
     return false;
   if (bookmark->is_folder() != sync_node->GetIsFolder())
     return false;