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

11 files changed, 35 insertions, 39 deletions

diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index 1b0dd45..a4f0461 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -87,7 +87,7 @@ Value* BookmarkCodec::EncodeNode(const BookmarkNode* node) {
   DictionaryValue* value = new DictionaryValue();
   std::string id = base::Int64ToString(node->id());
   value->SetString(kIdKey, id);
-  const string16& title = node->GetTitleAsString16();
+  const string16& title = node->GetTitle();
   value->SetString(kNameKey, title);
   value->SetString(kDateAddedKey,
                    base::Int64ToString(node->date_added().ToInternalValue()));
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc
index 0862402..accc8c6 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data.cc
@@ -24,7 +24,7 @@ const char* BookmarkDragData::kClipboardFormatString =
 BookmarkDragData::Element::Element(const BookmarkNode* node)
     : is_url(node->is_url()),
       url(node->GetURL()),
-      title(node->GetTitleAsString16()),
+      title(node->GetTitle()),
       id_(node->id()) {
   for (int i = 0; i < node->GetChildCount(); ++i)
     children.push_back(Element(node->GetChild(i)));
diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
index af98213..0e2c2b7 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
@@ -126,8 +126,7 @@ TEST_F(BookmarkDragDataTest, Group) {
   BookmarkDragData drag_data(g12);
   EXPECT_TRUE(drag_data.is_valid());
   ASSERT_EQ(1, drag_data.elements.size());
-  EXPECT_EQ(g12->GetTitleAsString16(),
-            WideToUTF16Hack(drag_data.elements[0].title));
+  EXPECT_EQ(g12->GetTitle(), WideToUTF16Hack(drag_data.elements[0].title));
   EXPECT_FALSE(drag_data.elements[0].is_url);
 
   OSExchangeData data;
@@ -139,8 +138,7 @@ TEST_F(BookmarkDragDataTest, Group) {
   EXPECT_TRUE(read_data.Read(data2));
   EXPECT_TRUE(read_data.is_valid());
   ASSERT_EQ(1, read_data.elements.size());
-  EXPECT_EQ(g12->GetTitleAsString16(),
-            WideToUTF16Hack(read_data.elements[0].title));
+  EXPECT_EQ(g12->GetTitle(), WideToUTF16Hack(read_data.elements[0].title));
   EXPECT_FALSE(read_data.elements[0].is_url);
 
   // We should get back the same node when asking for the same profile.
diff --git a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc
index a2cd475..1844fd8 100644
--- a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc
@@ -47,7 +47,7 @@ BookmarkFolderEditorController::BookmarkFolderEditorController(
       l10n_util::GetString(IDS_BOOMARK_BAR_EDIT_FOLDER_LABEL);
   std::wstring contents = IsNew() ?
       l10n_util::GetString(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME) :
-      UTF16ToWide(node_->GetTitleAsString16());
+      UTF16ToWide(node_->GetTitle());
 
   dialog_ = InputWindowDialog::Create(wnd, title, label, contents, this);
   model_->AddObserver(this);
diff --git a/chrome/browser/bookmarks/bookmark_index.cc b/chrome/browser/bookmarks/bookmark_index.cc
index ccea3c3..359fc3a 100644
--- a/chrome/browser/bookmarks/bookmark_index.cc
+++ b/chrome/browser/bookmarks/bookmark_index.cc
@@ -27,7 +27,7 @@ BookmarkIndex::NodeSet::const_iterator BookmarkIndex::Match::nodes_end() const {
 void BookmarkIndex::Add(const BookmarkNode* node) {
   if (!node->is_url())
     return;
-  std::vector<string16> terms = ExtractQueryWords(node->GetTitleAsString16());
+  std::vector<string16> terms = ExtractQueryWords(node->GetTitle());
   for (size_t i = 0; i < terms.size(); ++i)
     RegisterNode(terms[i], node);
 }
@@ -36,7 +36,7 @@ void BookmarkIndex::Remove(const BookmarkNode* node) {
   if (!node->is_url())
     return;
 
-  std::vector<string16> terms = ExtractQueryWords(node->GetTitleAsString16());
+  std::vector<string16> terms = ExtractQueryWords(node->GetTitle());
   for (size_t i = 0; i < terms.size(); ++i)
     UnregisterNode(terms[i], node);
 }
@@ -116,7 +116,7 @@ void BookmarkIndex::AddMatchToResults(
   // of QueryParser may filter it out.  For example, the query
   // ["thi"] will match the bookmark titled [Thinking], but since
   // ["thi"] is quoted we don't want to do a prefix match.
-  if (parser->DoesQueryMatch(node->GetTitleAsString16(), query_nodes,
+  if (parser->DoesQueryMatch(node->GetTitle(), query_nodes,
                              &(title_match.match_positions))) {
     title_match.node = node;
     results->push_back(title_match);
diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc
index d83587f..a421ad9 100644
--- a/chrome/browser/bookmarks/bookmark_index_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc
@@ -54,8 +54,7 @@ class BookmarkIndexTest : public testing::Test {
     for (size_t i = 0; i < expected_titles.size(); ++i) {
       bool found = false;
       for (size_t j = 0; j < matches.size(); ++j) {
-        if (ASCIIToUTF16(expected_titles[i]) ==
-            matches[j].node->GetTitleAsString16()) {
+        if (ASCIIToUTF16(expected_titles[i]) == matches[j].node->GetTitle()) {
           matches.erase(matches.begin() + j);
           found = true;
           break;
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index c5bc62f..288c4a8 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -93,10 +93,10 @@ class SortComparator : public std::binary_function<const BookmarkNode*,
     if (n1->type() == n2->type()) {
       // Types are the same, compare the names.
       if (!collator_)
-        return n1->GetTitleAsString16() < n2->GetTitleAsString16();
+        return n1->GetTitle() < n2->GetTitle();
       return l10n_util::CompareStringWithCollator(collator_,
-          UTF16ToWideHack(n1->GetTitleAsString16()),
-          UTF16ToWideHack(n2->GetTitleAsString16())) == UCOL_LESS;
+          UTF16ToWideHack(n1->GetTitle()), UTF16ToWideHack(n2->GetTitle())) ==
+          UCOL_LESS;
     }
     // Types differ, sort such that folders come first.
     return n1->is_folder();
@@ -247,7 +247,7 @@ void BookmarkModel::SetTitle(const BookmarkNode* node, const string16& title) {
     NOTREACHED();
     return;
   }
-  if (node->GetTitleAsString16() == title)
+  if (node->GetTitle() == title)
     return;
 
   if (node == bookmark_bar_node_ || node == other_node_) {
diff --git a/chrome/browser/bookmarks/bookmark_model_test_utils.cc b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
index 263e42f..e5b2a70 100644
--- a/chrome/browser/bookmarks/bookmark_model_test_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_model_test_utils.cc
@@ -15,7 +15,7 @@ void BookmarkModelTestUtils::AssertNodesEqual(const BookmarkNode* expected,
   ASSERT_TRUE(actual);
   if (check_ids)
     EXPECT_EQ(expected->id(), actual->id());
-  EXPECT_EQ(expected->GetTitleAsString16(), actual->GetTitleAsString16());
+  EXPECT_EQ(expected->GetTitle(), actual->GetTitle());
   EXPECT_EQ(expected->type(), actual->type());
   EXPECT_TRUE(expected->date_added() == actual->date_added());
   if (expected->type() == BookmarkNode::URL) {
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 66459c7..0bf7534 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -186,7 +186,7 @@ TEST_F(BookmarkModelTest, AddURL) {
   observer_details.AssertEquals(root, NULL, 0, -1);
 
   ASSERT_EQ(1, root->GetChildCount());
-  ASSERT_EQ(title, new_node->GetTitleAsString16());
+  ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_TRUE(url == new_node->GetURL());
   ASSERT_EQ(BookmarkNode::URL, new_node->type());
   ASSERT_TRUE(new_node == model.GetMostRecentlyAddedNodeForURL(url));
@@ -204,7 +204,7 @@ TEST_F(BookmarkModelTest, AddGroup) {
   observer_details.AssertEquals(root, NULL, 0, -1);
 
   ASSERT_EQ(1, root->GetChildCount());
-  ASSERT_EQ(title, new_node->GetTitleAsString16());
+  ASSERT_EQ(title, new_node->GetTitle());
   ASSERT_EQ(BookmarkNode::FOLDER, new_node->type());
 
   EXPECT_TRUE(new_node->id() != root->id() &&
@@ -268,7 +268,7 @@ TEST_F(BookmarkModelTest, SetTitle) {
   model.SetTitle(node, title);
   AssertObserverCount(0, 0, 0, 1, 0);
   observer_details.AssertEquals(node, NULL, -1, -1);
-  EXPECT_EQ(title, node->GetTitleAsString16());
+  EXPECT_EQ(title, node->GetTitle());
 }
 
 TEST_F(BookmarkModelTest, SetURL) {
@@ -633,11 +633,11 @@ static void PopulateBookmarkNode(TestNode* parent,
     TestNode* child = parent->GetChild(i);
     if (child->value == BookmarkNode::FOLDER) {
       const BookmarkNode* new_bb_node =
-          model->AddGroup(bb_node, i, child->GetTitleAsString16());
+          model->AddGroup(bb_node, i, child->GetTitle());
       PopulateBookmarkNode(child, model, new_bb_node);
     } else {
-      model->AddURL(bb_node, i, child->GetTitleAsString16(),
-          GURL("http://" + UTF16ToASCII(child->GetTitleAsString16())));
+      model->AddURL(bb_node, i, child->GetTitle(),
+          GURL("http://" + UTF16ToASCII(child->GetTitle())));
     }
   }
 }
@@ -670,8 +670,7 @@ class BookmarkModelTestWithProfile : public testing::Test,
     for (int i = 0; i < expected->GetChildCount(); ++i) {
       TestNode* expected_child = expected->GetChild(i);
       const BookmarkNode* actual_child = actual->GetChild(i);
-      ASSERT_EQ(expected_child->GetTitleAsString16(),
-                actual_child->GetTitleAsString16());
+      ASSERT_EQ(expected_child->GetTitle(), actual_child->GetTitle());
       if (expected_child->value == BookmarkNode::FOLDER) {
         ASSERT_TRUE(actual_child->type() == BookmarkNode::FOLDER);
         // Recurse throught children.
@@ -818,30 +817,29 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
 
     const BookmarkNode* child = bbn->GetChild(0);
     ASSERT_EQ(BookmarkNode::URL, child->type());
-    ASSERT_EQ(ASCIIToUTF16("Google"), child->GetTitleAsString16());
+    ASSERT_EQ(ASCIIToUTF16("Google"), child->GetTitle());
     ASSERT_TRUE(child->GetURL() == GURL("http://www.google.com"));
 
     child = bbn->GetChild(1);
     ASSERT_TRUE(child->is_folder());
-    ASSERT_EQ(ASCIIToUTF16("F1"), child->GetTitleAsString16());
+    ASSERT_EQ(ASCIIToUTF16("F1"), child->GetTitle());
     ASSERT_EQ(2, child->GetChildCount());
 
     const BookmarkNode* parent = child;
     child = parent->GetChild(0);
     ASSERT_EQ(BookmarkNode::URL, child->type());
-    ASSERT_EQ(ASCIIToUTF16("Google Advertising"), child->GetTitleAsString16());
+    ASSERT_EQ(ASCIIToUTF16("Google Advertising"), child->GetTitle());
     ASSERT_TRUE(child->GetURL() == GURL("http://www.google.com/intl/en/ads/"));
 
     child = parent->GetChild(1);
     ASSERT_TRUE(child->is_folder());
-    ASSERT_EQ(ASCIIToUTF16("F11"), child->GetTitleAsString16());
+    ASSERT_EQ(ASCIIToUTF16("F11"), child->GetTitle());
     ASSERT_EQ(1, child->GetChildCount());
 
     parent = child;
     child = parent->GetChild(0);
     ASSERT_EQ(BookmarkNode::URL, child->type());
-    ASSERT_EQ(ASCIIToUTF16("Google Business Solutions"),
-              child->GetTitleAsString16());
+    ASSERT_EQ(ASCIIToUTF16("Google Business Solutions"), child->GetTitle());
     ASSERT_TRUE(child->GetURL() == GURL("http://www.google.com/services/"));
 
     parent = bb_model_->other_node();
@@ -849,12 +847,12 @@ class BookmarkModelTestWithProfile2 : public BookmarkModelTestWithProfile {
 
     child = parent->GetChild(0);
     ASSERT_TRUE(child->is_folder());
-    ASSERT_EQ(ASCIIToUTF16("OF1"), child->GetTitleAsString16());
+    ASSERT_EQ(ASCIIToUTF16("OF1"), child->GetTitle());
     ASSERT_EQ(0, child->GetChildCount());
 
     child = parent->GetChild(1);
     ASSERT_EQ(BookmarkNode::URL, child->type());
-    ASSERT_EQ(ASCIIToUTF16("About Google"), child->GetTitleAsString16());
+    ASSERT_EQ(ASCIIToUTF16("About Google"), child->GetTitle());
     ASSERT_TRUE(child->GetURL() ==
                 GURL("http://www.google.com/intl/en/about.html"));
 
@@ -987,8 +985,8 @@ TEST_F(BookmarkModelTest, Sort) {
 
   // Make sure the order matches (remember, 'a' and 'C' are folders and
   // come first).
-  EXPECT_EQ(parent->GetChild(0)->GetTitleAsString16(), ASCIIToUTF16("a"));
-  EXPECT_EQ(parent->GetChild(1)->GetTitleAsString16(), ASCIIToUTF16("C"));
-  EXPECT_EQ(parent->GetChild(2)->GetTitleAsString16(), ASCIIToUTF16("B"));
-  EXPECT_EQ(parent->GetChild(3)->GetTitleAsString16(), ASCIIToUTF16("d"));
+  EXPECT_EQ(parent->GetChild(0)->GetTitle(), ASCIIToUTF16("a"));
+  EXPECT_EQ(parent->GetChild(1)->GetTitle(), ASCIIToUTF16("C"));
+  EXPECT_EQ(parent->GetChild(2)->GetTitle(), ASCIIToUTF16("B"));
+  EXPECT_EQ(parent->GetChild(3)->GetTitle(), ASCIIToUTF16("d"));
 }
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 47ef996..95767211 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -12,6 +12,7 @@
 #include "base/string_number_conversions.h"
 #include "base/string16.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #if defined(OS_MACOSX)
@@ -193,7 +194,7 @@ bool DoesBookmarkContainWords(const BookmarkNode* node,
                               const std::string& languages) {
   return
       DoesBookmarkTextContainWords(
-          l10n_util::ToLower(node->GetTitleAsString16()), words) ||
+          l10n_util::ToLower(node->GetTitle()), words) ||
       DoesBookmarkTextContainWords(
           l10n_util::ToLower(UTF8ToUTF16(node->GetURL().spec())), words) ||
       DoesBookmarkTextContainWords(l10n_util::ToLower(
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
index 529a6ae..e6309f4 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
@@ -56,7 +56,7 @@ int RecentlyUsedFoldersComboModel::GetItemCount() {
 string16 RecentlyUsedFoldersComboModel::GetItemAt(int index) {
   if (index == static_cast<int>(nodes_.size()))
     return l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
-  return nodes_[index]->GetTitleAsString16();
+  return nodes_[index]->GetTitle();
 }
 
 const BookmarkNode* RecentlyUsedFoldersComboModel::GetNodeAt(int index) {