Remove the wstring TreeModelNode::GetTitle() and rename GetTitleAsString16() to GetTitle().

BUG=23581
TEST=builds and passes tests

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

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

3 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/extensions/extension_bookmark_helpers.cc
index 25c24a0..ad7cbb0 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.cc
+++ b/chrome/browser/extensions/extension_bookmark_helpers.cc
@@ -36,7 +36,7 @@ DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
       dict->SetReal(keys::kDateGroupModifiedKey, floor(t.ToDoubleT() * 1000));
   }
 
-  dict->SetString(keys::kTitleKey, node->GetTitleAsString16());
+  dict->SetString(keys::kTitleKey, node->GetTitle());
   if (!node->date_added().is_null()) {
     // Javascript Date wants milliseconds since the epoch, ToDoubleT is
     // seconds.
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc
index 3fd8a18..8e6df4d 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc
@@ -86,7 +86,7 @@ void AddNodeToList(ListValue* list, const BookmarkNode& node) {
   if (node.is_url())
     dict->SetString(keys::kUrlKey, node.GetURL().spec());
 
-  dict->SetString(keys::kTitleKey, node.GetTitleAsString16());
+  dict->SetString(keys::kTitleKey, node.GetTitle());
 
   ListValue* children = new ListValue();
   for (int i = 0; i < node.GetChildCount(); ++i)
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index 1b3a986..3f3e8c9 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -173,7 +173,7 @@ void ExtensionBookmarkEventRouter::BookmarkNodeChanged(
   // for now we only include title and url.  The ideal thing would be to change
   // BookmarkModel to indicate what changed.
   DictionaryValue* object_args = new DictionaryValue();
-  object_args->SetString(keys::kTitleKey, node->GetTitleAsString16());
+  object_args->SetString(keys::kTitleKey, node->GetTitle());
   if (node->is_url())
     object_args->SetString(keys::kUrlKey, node->GetURL().spec());
   args.Append(object_args);
@@ -628,7 +628,7 @@ class CreateBookmarkBucketMapper : public BookmarkBucketMapper<std::string> {
     if (!parent)
       return;
 
-    std::string bucket_id = UTF16ToUTF8(parent->GetTitleAsString16());
+    std::string bucket_id = UTF16ToUTF8(parent->GetTitle());
     std::string title;
     json->GetString(keys::kTitleKey, &title);
     std::string url_string;
@@ -664,8 +664,8 @@ class RemoveBookmarksBucketMapper : public BookmarkBucketMapper<std::string> {
         return;
 
       std::string bucket_id;
-      bucket_id += UTF16ToUTF8(node->GetParent()->GetTitleAsString16());
-      bucket_id += UTF16ToUTF8(node->GetTitleAsString16());
+      bucket_id += UTF16ToUTF8(node->GetParent()->GetTitle());
+      bucket_id += UTF16ToUTF8(node->GetTitle());
       bucket_id += node->GetURL().spec();
       buckets->push_back(GetBucket(base::SHA1HashString(bucket_id)));
     }