Remove wstrings in bookmarks, part 5.

Remove wstring BookmarkModel::AddURL().

BUG=23581
TEST=builds and passes tests

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

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

25 files changed, 83 insertions, 78 deletions

diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
index 2fec356..6f681fb 100644
--- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
@@ -246,8 +246,10 @@ TEST_F(BookmarkCodecTest, ChecksumManualEditIDsTest) {
 
   // add a few extra nodes to bookmark model and make sure IDs are still uniuqe.
   const BookmarkNode* bb_node = decoded_model->GetBookmarkBarNode();
-  decoded_model->AddURL(bb_node, 0, L"new url1", GURL(L"http://newurl1.com"));
-  decoded_model->AddURL(bb_node, 0, L"new url2", GURL(L"http://newurl2.com"));
+  decoded_model->AddURL(bb_node, 0, ASCIIToUTF16("new url1"),
+                        GURL("http://newurl1.com"));
+  decoded_model->AddURL(bb_node, 0, ASCIIToUTF16("new url2"),
+                        GURL("http://newurl2.com"));
 
   ExpectIDsUnique(decoded_model.get());
 }
diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc
index 946bb42..3b0b33a 100644
--- a/chrome/browser/bookmarks/bookmark_index_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_index.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -32,7 +33,8 @@ class BookmarkIndexTest : public testing::Test {
   void AddBookmarksWithTitles(const std::vector<std::wstring>& titles) {
     GURL url("about:blank");
     for (size_t i = 0; i < titles.size(); ++i)
-      model_->AddURL(model_->other_node(), static_cast<int>(i), titles[i], url);
+      model_->AddURL(model_->other_node(), static_cast<int>(i),
+                     WideToUTF16Hack(titles[i]), url);
   }
 
   void ExpectMatches(const std::wstring& query,
@@ -206,7 +208,8 @@ TEST_F(BookmarkIndexTest, HonorMax) {
 // Makes sure if the lower case string of a bookmark title is more characters
 // than the upper case string no match positions are returned.
 TEST_F(BookmarkIndexTest, EmptyMatchOnMultiwideLowercaseString) {
-  const BookmarkNode* n1 = model_->AddURL(model_->other_node(), 0, L"\u0130 i",
+  const BookmarkNode* n1 = model_->AddURL(model_->other_node(), 0,
+                                          WideToUTF16(L"\u0130 i"),
                                           GURL("http://www.google.com"));
 
   std::vector<bookmark_utils::TitleMatch> matches;
@@ -254,7 +257,7 @@ TEST_F(BookmarkIndexTest, GetResultsSortedByTypedCount) {
     // Populate the InMemoryDatabase....
     url_db->AddURL(info);
     // Populate the BookmarkIndex.
-    model->AddURL(model->other_node(), i, UTF8ToWide(data[i].title),
+    model->AddURL(model->other_node(), i, UTF8ToUTF16(data[i].title),
                   data[i].url);
   }
 
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 7db3cbd..9a4a70a 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -376,14 +376,6 @@ const BookmarkNode* BookmarkModel::AddGroup(const BookmarkNode* parent,
   return AddNode(AsMutable(parent), index, new_node, false);
 }
 
-#if !defined(WCHAR_T_IS_UTF16)
-const BookmarkNode* BookmarkModel::AddURL(const BookmarkNode* parent,
-                                          int index,
-                                          const std::wstring& title,
-                                          const GURL& url) {
-  return AddURL(parent, index, WideToUTF16(title), url);
-}
-#endif
 const BookmarkNode* BookmarkModel::AddURL(const BookmarkNode* parent,
                                           int index,
                                           const string16& title,
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 63d12ad..8fcfb83 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -270,14 +270,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
                                int index,
                                const string16& title);
 
-  // TODO(munjal): Remove wstring overload once all code is moved to string16.
   // Adds a url at the specified position.
-#if !defined(WCHAR_T_IS_UTF16)
-  const BookmarkNode* AddURL(const BookmarkNode* parent,
-                             int index,
-                             const std::wstring& title,
-                             const GURL& url);
-#endif
   const BookmarkNode* AddURL(const BookmarkNode* parent,
                              int index,
                              const string16& title,
diff --git a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm
index 05e2c27..203a954 100644
--- a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm
+++ b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm
@@ -125,7 +125,7 @@
 
   const BookmarkNode* node = model->AddURL(bookmarkNode_,
                                            bookmarkNode_->GetChildCount(),
-                                           std::wstring(),
+                                           string16(),
                                            url);
   if (!node) {
     AppleScript::SetError(AppleScript::errCreateBookmarkItem);
@@ -155,7 +155,7 @@
 
   const BookmarkNode* node = model->AddURL(bookmarkNode_,
                                            position,
-                                           std::wstring(),
+                                           string16(),
                                            url);
   if (!node) {
     AppleScript::SetError(AppleScript::errCreateBookmarkItem);
diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller.h b/chrome/browser/cocoa/bookmark_all_tabs_controller.h
index d3b0848..4b34467 100644
--- a/chrome/browser/cocoa/bookmark_all_tabs_controller.h
+++ b/chrome/browser/cocoa/bookmark_all_tabs_controller.h
@@ -9,11 +9,12 @@
 #include <utility>
 #include <vector>
 
+#include "base/string16.h"
 #import "chrome/browser/cocoa/bookmark_editor_base_controller.h"
 
 // A list of pairs containing the name and URL associated with each
 // currently active tab in the active browser window.
-typedef std::pair<std::wstring, GURL> ActiveTabNameURLPair;
+typedef std::pair<string16, GURL> ActiveTabNameURLPair;
 typedef std::vector<ActiveTabNameURLPair> ActiveTabsNameURLPairVector;
 
 // A controller for the Bookmark All Tabs sheet which is presented upon
diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm b/chrome/browser/cocoa/bookmark_all_tabs_controller.mm
index 97269dc..13dd036 100644
--- a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm
+++ b/chrome/browser/cocoa/bookmark_all_tabs_controller.mm
@@ -43,7 +43,7 @@
   const int tabCount = tabstrip_model->count();
   for (int i = 0; i < tabCount; ++i) {
     TabContents* tc = tabstrip_model->GetTabContentsAt(i);
-    const std::wstring tabTitle = UTF16ToWideHack(tc->GetTitle());
+    const string16 tabTitle = tc->GetTitle();
     const GURL& tabURL(tc->GetURL());
     ActiveTabNameURLPair tabPair(tabTitle, tabURL);
     activeTabPairsVector_.push_back(tabPair);
diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm
index c2cb712..823bccc 100644
--- a/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm
@@ -24,11 +24,11 @@
       [self activeTabPairsVector];
   activeTabPairsVector->clear();
   activeTabPairsVector->push_back(
-      ActiveTabNameURLPair(L"at-0", GURL("http://at-0.com")));
+      ActiveTabNameURLPair(ASCIIToUTF16("at-0"), GURL("http://at-0.com")));
   activeTabPairsVector->push_back(
-      ActiveTabNameURLPair(L"at-1", GURL("http://at-1.com")));
+      ActiveTabNameURLPair(ASCIIToUTF16("at-1"), GURL("http://at-1.com")));
   activeTabPairsVector->push_back(
-      ActiveTabNameURLPair(L"at-2", GURL("http://at-2.com")));
+      ActiveTabNameURLPair(ASCIIToUTF16("at-2"), GURL("http://at-2.com")));
 }
 
 @end
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index 08e9977..3214a67 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -2287,8 +2287,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
       if (gurl.is_valid()) {
         bookmarkModel_->AddURL(destParent,
                                destIndex++,
-                               base::SysNSStringToWide([titles
-                                   objectAtIndex:i]),
+                               base::SysNSStringToUTF16(
+                                  [titles objectAtIndex:i]),
                                gurl);
         nodesWereAdded = YES;
       }
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
index a7b07c7..0e3771a 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
@@ -1293,7 +1293,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
     if (gurl.is_valid()) {
       bookmarkModel->AddURL(destParent,
                             destIndex++,
-                            base::SysNSStringToWide([titles objectAtIndex:i]),
+                            base::SysNSStringToUTF16([titles objectAtIndex:i]),
                             gurl);
       nodesWereAdded = YES;
     }
diff --git a/chrome/browser/cocoa/bookmark_button_cell_unittest.mm b/chrome/browser/cocoa/bookmark_button_cell_unittest.mm
index 8f93c69..7d483bb 100644
--- a/chrome/browser/cocoa/bookmark_button_cell_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_button_cell_unittest.mm
@@ -1,9 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "app/resource_bundle.h"
 #include "base/scoped_nsobject.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
 #import "chrome/browser/cocoa/bookmark_menu.h"
@@ -158,7 +159,8 @@ TEST_F(BookmarkButtonCellTest, Awake) {
 TEST_F(BookmarkButtonCellTest, FolderArrow) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* bar = model->GetBookmarkBarNode();
-  const BookmarkNode* node = model->AddURL(bar, bar->GetChildCount(), L"title",
+  const BookmarkNode* node = model->AddURL(bar, bar->GetChildCount(),
+                                           ASCIIToUTF16("title"),
                                            GURL("http://www.google.com"));
   scoped_nsobject<BookmarkButtonCell> cell(
     [[BookmarkButtonCell alloc] initForNode:node
diff --git a/chrome/browser/cocoa/bookmark_button_unittest.mm b/chrome/browser/cocoa/bookmark_button_unittest.mm
index 261dbf7..419be3d 100644
--- a/chrome/browser/cocoa/bookmark_button_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_button_unittest.mm
@@ -1,8 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/scoped_nsobject.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/cocoa/bookmark_button.h"
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
@@ -80,7 +81,8 @@ TEST_F(BookmarkButtonTest, FolderAndEmptyOrNot) {
   EXPECT_TRUE([button isFolder]);
   EXPECT_EQ([button bookmarkNode], node);
 
-  node = model->AddURL(node, 0, L"hi mom", GURL("http://www.google.com"));
+  node = model->AddURL(node, 0, ASCIIToUTF16("hi mom"),
+                       GURL("http://www.google.com"));
   [cell setBookmarkNode:node];
   EXPECT_FALSE([button isEmpty]);
   EXPECT_FALSE([button isFolder]);
diff --git a/chrome/browser/cocoa/bookmark_editor_controller.mm b/chrome/browser/cocoa/bookmark_editor_controller.mm
index fed6d7d..0de44ae 100644
--- a/chrome/browser/cocoa/bookmark_editor_controller.mm
+++ b/chrome/browser/cocoa/bookmark_editor_controller.mm
@@ -4,6 +4,7 @@
 
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #include "app/l10n_util.h"
+#include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
@@ -104,7 +105,7 @@
 - (NSNumber*)didCommit {
   NSString* name = [[self displayName] stringByTrimmingCharactersInSet:
                     [NSCharacterSet newlineCharacterSet]];
-  std::wstring newTitle = base::SysNSStringToWide(name);
+  string16 newTitle = base::SysNSStringToUTF16(name);
   const BookmarkNode* newParentNode = [self selectedNode];
   GURL newURL = [self GURLFromUrlField];
   if (!newURL.is_valid()) {
diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm
index 23ecf3e..f63d7c3 100644
--- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm
@@ -1,11 +1,12 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/string16.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
-#include "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
+#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 @interface FakeBookmarkMenuController : BookmarkMenuCocoaController {
@@ -20,7 +21,7 @@
 
 - (id)init {
   if ((self = [super init])) {
-    std::wstring empty;
+    string16 empty;
     helper_ = new BrowserTestHelper();
     BookmarkModel* model = helper_->browser()->profile()->GetBookmarkModel();
     const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode();
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 dc80711..4d6bef9 100644
--- a/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm
@@ -6,6 +6,7 @@
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
+#include "base/utf_string_conversions.h"
 #import "chrome/browser/cocoa/bookmark_model_observer_for_cocoa.h"
 #import "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ -39,7 +40,7 @@ class BookmarkModelObserverForCocoaTest : public CocoaTest {
 TEST_F(BookmarkModelObserverForCocoaTest, TestCallback) {
   BookmarkModel* model = helper_.profile()->GetBookmarkModel();
   const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(),
-                                           0, L"super",
+                                           0, ASCIIToUTF16("super"),
                                            GURL("http://www.google.com"));
 
   scoped_nsobject<ObserverPingTracker>
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 5ff281a..7d5f667 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -1231,7 +1231,7 @@ void BookmarkBarGtk::OnDragReceived(GtkWidget* widget,
       if (!url.is_valid())
         break;
       std::string title = bookmark_utils::GetNameForURL(url);
-      model_->AddURL(dest_node, index, UTF8ToWide(title), url);
+      model_->AddURL(dest_node, index, UTF8ToUTF16(title), url);
       dnd_success = TRUE;
       break;
     }
diff --git a/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc b/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc
index 3f9fdcf..1be108c 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk_unittest.cc
@@ -1,9 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/gtk/bookmark_bar_gtk.h"
 
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/chrome_thread.h"
@@ -59,7 +60,7 @@ TEST_F(BookmarkBarGtkUnittest, HidesHelpMessageWithBookmark) {
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   model->AddURL(parent, parent->GetChildCount(),
-                L"title", GURL("http://one.com"));
+                ASCIIToUTF16("title"), GURL("http://one.com"));
 
   bookmark_bar_->Loaded(model);
   EXPECT_FALSE(bookmark_bar_->show_instructions_);
@@ -70,9 +71,9 @@ TEST_F(BookmarkBarGtkUnittest, BuildsButtons) {
 
   const BookmarkNode* parent = model->GetBookmarkBarNode();
   model->AddURL(parent, parent->GetChildCount(),
-                L"title", GURL("http://one.com"));
+                ASCIIToUTF16("title"), GURL("http://one.com"));
   model->AddURL(parent, parent->GetChildCount(),
-                L"other", GURL("http://two.com"));
+                ASCIIToUTF16("other"), GURL("http://two.com"));
 
   bookmark_bar_->Loaded(model);
 
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc
index 38c16df..1e6eec9 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/gtk/bookmark_utils_gtk.cc
@@ -409,7 +409,7 @@ bool CreateNewBookmarkFromNamedUrl(GtkSelectionData* selection_data,
   if (!gtk_dnd_util::ExtractNamedURL(selection_data, &url, &title))
     return false;
 
-  model->AddURL(parent, idx, UTF16ToWideHack(title), url);
+  model->AddURL(parent, idx, title, url);
   return true;
 }
 
@@ -419,7 +419,7 @@ bool CreateNewBookmarksFromURIList(GtkSelectionData* selection_data,
   gtk_dnd_util::ExtractURIList(selection_data, &urls);
   for (size_t i = 0; i < urls.size(); ++i) {
     std::string title = GetNameForURL(urls[i]);
-    model->AddURL(parent, idx++, UTF8ToWide(title), urls[i]);
+    model->AddURL(parent, idx++, UTF8ToUTF16(title), urls[i]);
   }
   return true;
 }
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index ac3e834..60c783d 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -78,7 +78,7 @@ class ExpireHistoryTest : public testing::Test,
 
   void StarURL(const GURL& url) {
     bookmark_model_.AddURL(
-        bookmark_model_.GetBookmarkBarNode(), 0, std::wstring(), url);
+        bookmark_model_.GetBookmarkBarNode(), 0, string16(), url);
   }
 
   static bool IsStringInFile(const FilePath& filename, const char* str);
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index fe36c9d..ff91c53 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -253,7 +253,7 @@ TEST_F(HistoryBackendTest, DeleteAll) {
 
   // Star row1.
   bookmark_model_.AddURL(
-      bookmark_model_.GetBookmarkBarNode(), 0, std::wstring(), row1.url());
+      bookmark_model_.GetBookmarkBarNode(), 0, string16(), row1.url());
 
   // Set full text index for each one.
   backend_->text_database_->AddPageData(row1.url(), row1_id, visit1_id,
@@ -574,8 +574,8 @@ TEST_F(HistoryBackendTest, ImportedFaviconsTest) {
   EXPECT_TRUE(backend_->db_->GetRowForURL(url3, &url_row3) == 0);
 
   // If the URL is bookmarked, it should get added to history with 0 visits.
-  bookmark_model_.AddURL(bookmark_model_.GetBookmarkBarNode(), 0,
-                         std::wstring(), url3);
+  bookmark_model_.AddURL(bookmark_model_.GetBookmarkBarNode(), 0, string16(),
+                         url3);
   backend_->SetImportedFavicons(favicons);
   EXPECT_FALSE(backend_->db_->GetRowForURL(url3, &url_row3) == 0);
   EXPECT_TRUE(url_row3.visit_count() == 0);
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 4afd874..1a6a646 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -547,10 +547,11 @@ TEST_F(ProfileSyncServiceTest, ServerChangeProcessing) {
   adds.AddURL(L"Some old site", "http://slog.thestranger.com/",
               bookmark_bar_id(), u1);
   // u5 tests an empty-string title.
-  std::string javascript_url("javascript:(function(){var w=window.open(" \
-                             "'about:blank','gnotesWin','location=0,menubar=0," \
-                             "scrollbars=0,status=0,toolbar=0,width=300," \
-                             "height=300,resizable');});");
+  std::string javascript_url(
+      "javascript:(function(){var w=window.open(" \
+      "'about:blank','gnotesWin','location=0,menubar=0," \
+      "scrollbars=0,status=0,toolbar=0,width=300," \
+      "height=300,resizable');});");
   adds.AddURL(L"", javascript_url, other_bookmarks_id(), 0);
 
   vector<sync_api::SyncManager::ChangeRecord>::const_iterator it;
@@ -1272,7 +1273,8 @@ TEST_F(ProfileSyncServiceTestWithData, ModelAssociationInvalidPersistence) {
   // the situation where bookmark model is different from sync model and
   // make sure model associator correctly rebuilds associations.
   const BookmarkNode* bookmark_bar_node = model_->GetBookmarkBarNode();
-  model_->AddURL(bookmark_bar_node, 0, L"xtra", GURL("http://www.xtra.com"));
+  model_->AddURL(bookmark_bar_node, 0, ASCIIToUTF16("xtra"),
+                 GURL("http://www.xtra.com"));
   // Now restart the sync service. This time it will try to use the persistent
   // associations and realize that they are invalid and hence will rebuild
   // associations.
diff --git a/chrome/browser/views/bookmark_bar_view_unittest.cc b/chrome/browser/views/bookmark_bar_view_unittest.cc
index 29be678..126c668 100644
--- a/chrome/browser/views/bookmark_bar_view_unittest.cc
+++ b/chrome/browser/views/bookmark_bar_view_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
@@ -26,7 +27,7 @@ TEST_F(BookmarkBarViewTest, SwitchProfile) {
   profile()->GetBookmarkModel()->AddURL(
       profile()->GetBookmarkModel()->GetBookmarkBarNode(),
       0,
-      L"blah",
+      ASCIIToUTF16("blah"),
       GURL("http://www.google.com"));
 
   BookmarkBarView bookmark_bar(profile(), browser());
diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index 47eda8ad..fa32911 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -10,6 +10,7 @@
 #include "app/tree_node_iterator.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"
@@ -183,11 +184,13 @@ const BookmarkNode* BookmarkModelVerifier::AddURL(BookmarkModel* model,
     const GURL& url) {
   const BookmarkNode* v_parent = NULL;
   FindNodeInVerifier(model, parent, &v_parent);
-  const BookmarkNode* result = model->AddURL(parent, index, title, url);
+  const BookmarkNode* result = model->AddURL(parent, index,
+                                             WideToUTF16Hack(title), url);
   EXPECT_TRUE(result);
   if (!result)
     return NULL;
-  const BookmarkNode* v_node = model_->AddURL(v_parent, index, title, url);
+  const BookmarkNode* v_node = model_->AddURL(v_parent, index,
+                                              WideToUTF16Hack(title), url);
   EXPECT_TRUE(v_node);
   if (!v_node)
     return NULL;
diff --git a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
index 2a8fb13..06846a4 100644
--- a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
@@ -95,8 +95,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, Sanity) {
     // Do something crazy and modify the same item from both clients!!
     const BookmarkNode* google_one = GetByUniqueURL(bm0, google_url);
     const BookmarkNode* google_two = GetByUniqueURL(bm1, google_url);
-    bm0->SetTitle(google_one, L"Google++");
-    bm1->SetTitle(google_two, L"Google--");
+    bm0->SetTitle(google_one, ASCIIToUTF16("Google++"));
+    bm1->SetTitle(google_two, ASCIIToUTF16("Google--"));
   }
 
   ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
@@ -146,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   {
     const BookmarkNode* google_one = bm_bar0->GetChild(0);
-    bm0->SetTitle(google_one, L"Google1");
+    bm0->SetTitle(google_one, ASCIIToUTF16("Google1"));
   }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
@@ -1864,17 +1864,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   // Let's add 2 bookmarks (without favicon) on each client.
   {
     const BookmarkNode* bm_foo1 = bm0->AddURL(
-        bm_bar0, 0, L"Foo1", GURL("http://www.foo1.com"));
+        bm_bar0, 0, ASCIIToUTF16("Foo1"), GURL("http://www.foo1.com"));
     ASSERT_TRUE(bm_foo1 != NULL);
     const BookmarkNode* bm_foo3 = bm1->AddURL(
-        bm_bar1, 0, L"Foo3", GURL("http://www.foo3.com"));
+        bm_bar1, 0, ASCIIToUTF16("Foo3"), GURL("http://www.foo3.com"));
     ASSERT_TRUE(bm_foo3 != NULL);
 
     const BookmarkNode* bm_foo2 = bm0->AddURL(
-        bm_bar0, 1, L"Foo2", GURL("http://www.foo2.com"));
+        bm_bar0, 1, ASCIIToUTF16("Foo2"), GURL("http://www.foo2.com"));
     ASSERT_TRUE(bm_foo2 != NULL);
     const BookmarkNode* bm_foo4 = bm1->AddURL(
-        bm_bar1, 1, L"Foo4", GURL("http://www.foo4.com"));
+        bm_bar1, 1, ASCIIToUTF16("Foo4"), GURL("http://www.foo4.com"));
     ASSERT_TRUE(bm_foo4 != NULL);
   }
 
@@ -1906,8 +1906,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3; index++) {
-    wstring title(L"TestBookmark");
-    title.append(IntToWStringHack(index));
+    string16 title(ASCIIToUTF16("TestBookmark"));
+    title.append(base::IntToString16(index));
     string url("http://www.nofaviconurl");
     url.append(base::IntToString(index));
     url.append(".com");
@@ -1921,8 +1921,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   // Let's add some different bookmarks (without favicon) to client1.
   for (int index = 3; index < 11 ; index++) {
-    wstring title(L"Client1-TestBookmark");
-    title.append(IntToWStringHack(index));
+    string16 title(ASCIIToUTF16("Client1-TestBookmark"));
+    title.append(base::IntToString16(index));
     string url("http://www.client1-nofaviconurl");
     url.append(base::IntToString(index));
     url.append(".com");
@@ -1933,8 +1933,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
    // Let's add some different bookmarks (without favicon) to client2.
   for (int index = 3; index < 11 ; index++) {
-    wstring title(L"Client2-TestBookmark");
-    title.append(IntToWStringHack(index));
+    string16 title(ASCIIToUTF16("Client2-TestBookmark"));
+    title.append(base::IntToString16(index));
     string url("http://www.Client2-nofaviconurl");
     url.append(base::IntToString(index));
     url.append(".com");
@@ -1968,8 +1968,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3 ; index++) {
-    wstring title(L"TestBookmark");
-    title.append(IntToWStringHack(index));
+    string16 title(ASCIIToUTF16("TestBookmark"));
+    title.append(base::IntToString16(index));
     string url("http://www.nofaviconurl");
     url.append(base::IntToString(index));
     url.append(".com");
@@ -1983,8 +1983,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   // Let's add some different bookmarks (without favicon) to client2.
   for (int index = 3; index < 5 ; index++) {
-    wstring title(L"Client2-TestBookmark");
-    title.append(IntToWStringHack(index));
+    string16 title(ASCIIToUTF16("Client2-TestBookmark"));
+    title.append(base::IntToString16(index));
     string url("http://www.client2-nofaviconurl");
     url.append(base::IntToString(index));
     url.append(".com");
@@ -2018,8 +2018,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3 ; index++) {
-    wstring title(L"TestBookmark");
-    title.append(IntToWStringHack(index));
+    string16 title(ASCIIToUTF16("TestBookmark"));
+    title.append(base::IntToString16(index));
     string url("http://www.nofaviconurl");
     url.append(base::IntToString(index));
     url.append(".com");
diff --git a/chrome/test/model_test_utils.cc b/chrome/test/model_test_utils.cc
index d55a571..8522622 100644
--- a/chrome/test/model_test_utils.cc
+++ b/chrome/test/model_test_utils.cc
@@ -56,7 +56,7 @@ std::wstring::size_type AddNodesFromString(BookmarkModel& model,
         std::string url_string("http://");
         url_string += std::string(node_name.begin(), node_name.end());
         url_string += ".com";
-        model.AddURL(node, index, node_name, GURL(url_string));
+        model.AddURL(node, index, WideToUTF16Hack(node_name), GURL(url_string));
         ++end_pos;
       }
       ++index;