Remove wstrings from bookmarks, part 6.

Remove the wstring version of BookmarkModel::SetTitle().

BUG=23581
TEST=builds and passes enough tests

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

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

11 files changed, 12 insertions, 21 deletions

diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc
index 3b0b33a..79b4710 100644
--- a/chrome/browser/bookmarks/bookmark_index_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc
@@ -191,7 +191,7 @@ TEST_F(BookmarkIndexTest, ChangeTitle) {
 
   // Remove the node and make sure we don't get back any results.
   const wchar_t* expected[] = { L"blah" };
-  model_->SetTitle(model_->other_node()->GetChild(0), L"blah");
+  model_->SetTitle(model_->other_node()->GetChild(0), ASCIIToUTF16("blah"));
   ExpectMatches(L"BlAh", expected, ARRAYSIZE_UNSAFE(expected));
 }
 
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 9a4a70a..79892b1 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -241,12 +241,6 @@ const SkBitmap& BookmarkModel::GetFavIcon(const BookmarkNode* node) {
   return node->favicon();
 }
 
-#if !defined(WCHAR_T_IS_UTF16)
-void BookmarkModel::SetTitle(const BookmarkNode* node,
-                             const std::wstring& title) {
-  SetTitle(node, WideToUTF16(title));
-}
-#endif
 void BookmarkModel::SetTitle(const BookmarkNode* node, const string16& title) {
   if (!node) {
     NOTREACHED();
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 8fcfb83..988ad7d 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -230,11 +230,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
   // loaded it is loaded and the observer of the model notified when done.
   const SkBitmap& GetFavIcon(const BookmarkNode* node);
 
-  // TODO(munjal): Remove wstring overload once all code is moved to string16.
   // Sets the title of the specified node.
-#if !defined(WCHAR_T_IS_UTF16)
-  void SetTitle(const BookmarkNode* node, const std::wstring& title);
-#endif
   void SetTitle(const BookmarkNode* node, const string16& title);
 
   // Sets the URL of the specified bookmark node.
diff --git a/chrome/browser/cocoa/applescript/bookmark_node_applescript.mm b/chrome/browser/cocoa/applescript/bookmark_node_applescript.mm
index 14f0259..1b36d05 100644
--- a/chrome/browser/cocoa/applescript/bookmark_node_applescript.mm
+++ b/chrome/browser/cocoa/applescript/bookmark_node_applescript.mm
@@ -99,7 +99,7 @@
   if (!model)
     return;
 
-  model->SetTitle(bookmarkNode_, base::SysNSStringToWide(aTitle));
+  model->SetTitle(bookmarkNode_, base::SysNSStringToUTF16(aTitle));
 }
 
 - (BookmarkModel*)bookmarkModel {
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.mm b/chrome/browser/cocoa/bookmark_bubble_controller.mm
index 8b83541..b7fd366 100644
--- a/chrome/browser/cocoa/bookmark_bubble_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bubble_controller.mm
@@ -327,7 +327,7 @@ void BookmarkBubbleNotificationBridge::Observe(
   NSString* oldTitle = base::SysWideToNSString(node_->GetTitle());
   NSString* newTitle = [nameTextField_ stringValue];
   if (![oldTitle isEqual:newTitle]) {
-    model_->SetTitle(node_, base::SysNSStringToWide(newTitle));
+    model_->SetTitle(node_, base::SysNSStringToUTF16(newTitle));
     UserMetrics::RecordAction(
         UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"),
         model_->profile());
diff --git a/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm
index 4d6bef9..1008ef8 100644
--- a/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm
@@ -53,7 +53,7 @@ TEST_F(BookmarkModelObserverForCocoaTest, TestCallback) {
 
   EXPECT_EQ(0, pingCount.get()->pings);
 
-  model->SetTitle(node, L"duper");
+  model->SetTitle(node, ASCIIToUTF16("duper"));
   EXPECT_EQ(1, pingCount.get()->pings);
   model->SetURL(node, GURL("http://www.google.com/reader"));
   EXPECT_EQ(2, pingCount.get()->pings);
diff --git a/chrome/browser/cocoa/bookmark_name_folder_controller.mm b/chrome/browser/cocoa/bookmark_name_folder_controller.mm
index 57b9116..e6f05a6 100644
--- a/chrome/browser/cocoa/bookmark_name_folder_controller.mm
+++ b/chrome/browser/cocoa/bookmark_name_folder_controller.mm
@@ -90,7 +90,7 @@
   NSString* name = [nameField_ stringValue];
   BookmarkModel* model = profile_->GetBookmarkModel();
   if (node_) {
-    model->SetTitle(node_, base::SysNSStringToWide(name));
+    model->SetTitle(node_, base::SysNSStringToUTF16(name));
   } else {
     model->AddGroup(parent_,
                     newIndex_,
diff --git a/chrome/browser/gtk/bookmark_tree_model.cc b/chrome/browser/gtk/bookmark_tree_model.cc
index 9f18f54..ab697ba 100644
--- a/chrome/browser/gtk/bookmark_tree_model.cc
+++ b/chrome/browser/gtk/bookmark_tree_model.cc
@@ -66,7 +66,7 @@ void RecursiveResolve(BookmarkModel* bb_model, const BookmarkNode* bb_node,
           }
         }
         DCHECK(child_bb_node);
-        bb_model->SetTitle(child_bb_node, UTF16ToWide(title));
+        bb_model->SetTitle(child_bb_node, title);
       }
       RecursiveResolve(bb_model, child_bb_node,
                        tree_model, &child_iter,
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 00ed6a2..03cce0b 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -465,7 +465,7 @@ const BookmarkNode* BookmarkChangeProcessor::CreateOrUpdateBookmarkNode(
 
     if (!src->GetIsFolder())
       model->SetURL(dst, src->GetURL());
-    model->SetTitle(dst, src->GetTitle());
+    model->SetTitle(dst, WideToUTF16Hack(src->GetTitle()));
 
     SetBookmarkFavicon(src, dst, model->profile());
   }
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 667e033..9fda102 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -7,6 +7,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ -390,8 +391,8 @@ void BookmarkBubbleView::ApplyEdits() {
   BookmarkModel* model = profile_->GetBookmarkModel();
   const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
   if (node) {
-    const std::wstring new_title = UTF16ToWide(title_tf_->text());
-    if (new_title != node->GetTitle()) {
+    const string16 new_title = title_tf_->text();
+    if (new_title != node->GetTitleAsString16()) {
       model->SetTitle(node, new_title);
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"),
diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index fa32911..c356be3 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -203,8 +203,8 @@ void BookmarkModelVerifier::SetTitle(BookmarkModel* model,
                                      const wstring& title) {
   const BookmarkNode* v_node = NULL;
   FindNodeInVerifier(model, node, &v_node);
-  model->SetTitle(node, title);
-  model_->SetTitle(v_node, title);
+  model->SetTitle(node, WideToUTF16Hack(title));
+  model_->SetTitle(v_node, WideToUTF16Hack(title));
 }
 
 void BookmarkModelVerifier::Move(BookmarkModel* model, const BookmarkNode* node,