diff options
36 files changed, 446 insertions, 391 deletions
diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc index 8272270..2fec356 100644 --- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_codec_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 "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_codec.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -13,16 +14,16 @@ namespace { -const wchar_t kUrl1Title[] = L"url1"; -const wchar_t kUrl1Url[] = L"http://www.url1.com"; -const wchar_t kUrl2Title[] = L"url2"; -const wchar_t kUrl2Url[] = L"http://www.url2.com"; -const wchar_t kUrl3Title[] = L"url3"; -const wchar_t kUrl3Url[] = L"http://www.url3.com"; -const wchar_t kUrl4Title[] = L"url4"; -const wchar_t kUrl4Url[] = L"http://www.url4.com"; -const wchar_t kGroup1Title[] = L"group1"; -const wchar_t kGroup2Title[] = L"group2"; +const char kUrl1Title[] = "url1"; +const char kUrl1Url[] = "http://www.url1.com"; +const char kUrl2Title[] = "url2"; +const char kUrl2Url[] = "http://www.url2.com"; +const char kUrl3Title[] = "url3"; +const char kUrl3Url[] = "http://www.url3.com"; +const char kUrl4Title[] = "url4"; +const char kUrl4Url[] = "http://www.url4.com"; +const char kGroup1Title[] = "group1"; +const char kGroup2Title[] = "group2"; // Helper to get a mutable bookmark node. static BookmarkNode* AsMutable(const BookmarkNode* node) { @@ -37,22 +38,23 @@ class BookmarkCodecTest : public testing::Test { BookmarkModel* CreateTestModel1() { scoped_ptr<BookmarkModel> model(new BookmarkModel(NULL)); const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode(); - model->AddURL(bookmark_bar, 0, kUrl1Title, GURL(kUrl1Url)); + model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url)); return model.release(); } BookmarkModel* CreateTestModel2() { scoped_ptr<BookmarkModel> model(new BookmarkModel(NULL)); const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode(); - model->AddURL(bookmark_bar, 0, kUrl1Title, GURL(kUrl1Url)); - model->AddURL(bookmark_bar, 1, kUrl2Title, GURL(kUrl2Url)); + model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url)); + model->AddURL(bookmark_bar, 1, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url)); return model.release(); } BookmarkModel* CreateTestModel3() { scoped_ptr<BookmarkModel> model(new BookmarkModel(NULL)); const BookmarkNode* bookmark_bar = model->GetBookmarkBarNode(); - model->AddURL(bookmark_bar, 0, kUrl1Title, GURL(kUrl1Url)); - const BookmarkNode* group1 = model->AddGroup(bookmark_bar, 1, kGroup1Title); - model->AddURL(group1, 0, kUrl2Title, GURL(kUrl2Url)); + model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url)); + const BookmarkNode* group1 = model->AddGroup(bookmark_bar, 1, + ASCIIToUTF16(kGroup1Title)); + model->AddURL(group1, 0, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url)); return model.release(); } @@ -266,10 +268,12 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) { // ID persistence is working properly. const BookmarkNode* bookmark_bar = decoded_model.GetBookmarkBarNode(); decoded_model.AddURL( - bookmark_bar, bookmark_bar->GetChildCount(), kUrl3Title, GURL(kUrl3Url)); + bookmark_bar, bookmark_bar->GetChildCount(), ASCIIToUTF16(kUrl3Title), + GURL(kUrl3Url)); const BookmarkNode* group2_node = decoded_model.AddGroup( - bookmark_bar, bookmark_bar->GetChildCount(), kGroup2Title); - decoded_model.AddURL(group2_node, 0, kUrl4Title, GURL(kUrl4Url)); + bookmark_bar, bookmark_bar->GetChildCount(), ASCIIToUTF16(kGroup2Title)); + decoded_model.AddURL(group2_node, 0, ASCIIToUTF16(kUrl4Title), + GURL(kUrl4Url)); BookmarkCodec encoder2; scoped_ptr<Value> model_value2(encoder2.Encode(&decoded_model)); diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc index 26dd65e..d4b09a1 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_ptr.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -86,18 +87,18 @@ class BookmarkContextMenuControllerTest : public testing::Test { void AddTestData() { std::string test_base = "file:///c:/tmp/"; - model_->AddURL(model_->GetBookmarkBarNode(), 0, L"a", + model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"), GURL(test_base + "a")); const BookmarkNode* f1 = - model_->AddGroup(model_->GetBookmarkBarNode(), 1, L"F1"); - model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a")); - const BookmarkNode* f11 = model_->AddGroup(f1, 1, L"F11"); - model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a")); - model_->AddGroup(model_->GetBookmarkBarNode(), 2, L"F2"); - model_->AddGroup(model_->GetBookmarkBarNode(), 3, L"F3"); + model_->AddGroup(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1")); + model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a")); + const BookmarkNode* f11 = model_->AddGroup(f1, 1, ASCIIToUTF16("F11")); + model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a")); + model_->AddGroup(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2")); + model_->AddGroup(model_->GetBookmarkBarNode(), 3, ASCIIToUTF16("F3")); const BookmarkNode* f4 = - model_->AddGroup(model_->GetBookmarkBarNode(), 4, L"F4"); - model_->AddURL(f4, 0, L"f4a", GURL(test_base + "f4a")); + model_->AddGroup(model_->GetBookmarkBarNode(), 4, ASCIIToUTF16("F4")); + model_->AddURL(f4, 0, ASCIIToUTF16("f4a"), GURL(test_base + "f4a")); } }; diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc index 55fc3b59..d9bf74d 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -6,6 +6,7 @@ #include "app/os_exchange_data_provider_win.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/chrome_thread.h" @@ -118,9 +119,9 @@ TEST_F(BookmarkDragDataTest, Group) { profile.SetID(L"id"); BookmarkModel* model = profile.GetBookmarkModel(); const BookmarkNode* root = model->GetBookmarkBarNode(); - const BookmarkNode* g1 = model->AddGroup(root, 0, L"g1"); - const BookmarkNode* g11 = model->AddGroup(g1, 0, L"g11"); - const BookmarkNode* g12 = model->AddGroup(g1, 0, L"g12"); + const BookmarkNode* g1 = model->AddGroup(root, 0, ASCIIToUTF16("g1")); + const BookmarkNode* g11 = model->AddGroup(g1, 0, ASCIIToUTF16("g11")); + const BookmarkNode* g12 = model->AddGroup(g1, 0, ASCIIToUTF16("g12")); BookmarkDragData drag_data(g12); EXPECT_TRUE(drag_data.is_valid()); @@ -157,7 +158,7 @@ TEST_F(BookmarkDragDataTest, GroupWithChild) { profile.BlockUntilBookmarkModelLoaded(); BookmarkModel* model = profile.GetBookmarkModel(); const BookmarkNode* root = model->GetBookmarkBarNode(); - const BookmarkNode* group = model->AddGroup(root, 0, L"g1"); + const BookmarkNode* group = model->AddGroup(root, 0, ASCIIToUTF16("g1")); GURL url(GURL("http://foo.com")); const std::wstring title(L"blah2"); @@ -196,7 +197,7 @@ TEST_F(BookmarkDragDataTest, MultipleNodes) { profile.BlockUntilBookmarkModelLoaded(); BookmarkModel* model = profile.GetBookmarkModel(); const BookmarkNode* root = model->GetBookmarkBarNode(); - const BookmarkNode* group = model->AddGroup(root, 0, L"g1"); + const BookmarkNode* group = model->AddGroup(root, 0, ASCIIToUTF16("g1")); GURL url(GURL("http://foo.com")); const std::wstring title(L"blah2"); diff --git a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc index 4966c7c..a2cd475 100644 --- a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc +++ b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc @@ -5,6 +5,7 @@ #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h" #include "app/l10n_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profile.h" #include "grit/generated_resources.h" @@ -62,9 +63,9 @@ bool BookmarkFolderEditorController::IsValid(const std::wstring& text) { void BookmarkFolderEditorController::InputAccepted(const std::wstring& text) { if (IsNew()) - model_->AddGroup(node_, index_, text); + model_->AddGroup(node_, index_, WideToUTF16Hack(text)); else - model_->SetTitle(node_, text); + model_->SetTitle(node_, WideToUTF16Hack(text)); } void BookmarkFolderEditorController::InputCanceled() { diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 8172437..40f5110 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -84,9 +84,9 @@ class BookmarkHTMLWriterTest : public testing::Test { const GURL& url, const string16& title, base::Time creation_time, - const std::wstring& f1, - const std::wstring& f2, - const std::wstring& f3) { + const string16& f1, + const string16& f2, + const string16& f3) { ProfileWriter::BookmarkEntry entry; entry.in_toolbar = on_toolbar; entry.url = url; @@ -94,11 +94,11 @@ class BookmarkHTMLWriterTest : public testing::Test { // to the importer. entry.path.push_back(L"x"); if (!f1.empty()) { - entry.path.push_back(f1); + entry.path.push_back(UTF16ToWideHack(f1)); if (!f2.empty()) { - entry.path.push_back(f2); + entry.path.push_back(UTF16ToWideHack(f2)); if (!f3.empty()) - entry.path.push_back(f3); + entry.path.push_back(UTF16ToWideHack(f3)); } } entry.title = UTF16ToWideHack(title); @@ -111,9 +111,9 @@ class BookmarkHTMLWriterTest : public testing::Test { const GURL& url, const string16& title, base::Time creation_time, - const std::wstring& f1, - const std::wstring& f2, - const std::wstring& f3) { + const string16& f1, + const string16& f2, + const string16& f3) { EXPECT_EQ(BookmarkValuesToString(on_toolbar, url, title, creation_time, f1, f2, f3), BookmarkEntryToString(entry)); @@ -173,10 +173,10 @@ TEST_F(BookmarkHTMLWriterTest, Test) { // F3 // F4 // url1 - std::wstring f1_title = L"F\"&;<1\""; - std::wstring f2_title = L"F2"; - std::wstring f3_title = L"F 3"; - std::wstring f4_title = L"F4"; + string16 f1_title = ASCIIToUTF16("F\"&;<1\""); + string16 f2_title = ASCIIToUTF16("F2"); + string16 f3_title = ASCIIToUTF16("F 3"); + string16 f4_title = ASCIIToUTF16("F4"); string16 url1_title = ASCIIToUTF16("url 1"); string16 url2_title = ASCIIToUTF16("url&2"); string16 url3_title = ASCIIToUTF16("url\"3"); @@ -245,22 +245,20 @@ TEST_F(BookmarkHTMLWriterTest, Test) { // Verify we got back what we wrote. ASSERT_EQ(7U, parsed_bookmarks.size()); // Windows and ChromeOS builds use Sentence case. - std::wstring bookmark_folder_name = - l10n_util::GetString(IDS_BOOMARK_BAR_FOLDER_NAME); + string16 bookmark_folder_name = + l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME); AssertBookmarkEntryEquals(parsed_bookmarks[0], false, url1, url1_title, t1, - bookmark_folder_name, f1_title, std::wstring()); + bookmark_folder_name, f1_title, string16()); AssertBookmarkEntryEquals(parsed_bookmarks[1], false, url2, url2_title, t2, bookmark_folder_name, f1_title, f2_title); AssertBookmarkEntryEquals(parsed_bookmarks[2], false, url3, url3_title, t3, - bookmark_folder_name, std::wstring(), - std::wstring()); + bookmark_folder_name, string16(), string16()); AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4, - bookmark_folder_name, std::wstring(), - std::wstring()); + bookmark_folder_name, string16(), string16()); AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1, - std::wstring(), std::wstring(), std::wstring()); + string16(), string16(), string16()); AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2, - std::wstring(), std::wstring(), std::wstring()); + string16(), string16(), string16()); AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1, - f3_title, f4_title, std::wstring()); + f3_title, f4_title, string16()); } diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 0929ba6..7db3cbd 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -358,13 +358,6 @@ const BookmarkNode* BookmarkModel::GetNodeByID(int64 id) { return GetNodeByID(&root_, id); } -#if !defined(WCHAR_T_IS_UTF16) -const BookmarkNode* BookmarkModel::AddGroup(const BookmarkNode* parent, - int index, - const std::wstring& title) { - return AddGroup(parent, index, WideToUTF16(title)); -} -#endif const BookmarkNode* BookmarkModel::AddGroup(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 c5436db..63d12ad 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -265,13 +265,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { // the specified id. const BookmarkNode* GetNodeByID(int64 id); - // TODO(munjal): Remove wstring overload once all code is moved to string16. // Adds a new group node at the specified position. -#if !defined(WCHAR_T_IS_UTF16) - const BookmarkNode* AddGroup(const BookmarkNode* parent, - int index, - const std::wstring& title); -#endif const BookmarkNode* AddGroup(const BookmarkNode* parent, int index, const string16& title); diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 753c38c..2b04c2d 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -536,7 +536,7 @@ bool DoesBookmarkContainText(const BookmarkNode* node, static const BookmarkNode* CreateNewNode(BookmarkModel* model, const BookmarkNode* parent, const BookmarkEditor::EditDetails& details, - const std::wstring& new_title, const GURL& new_url) { + const string16& new_title, const GURL& new_url) { const BookmarkNode* node; if (details.type == BookmarkEditor::EditDetails::NEW_URL) { node = model->AddURL(parent, parent->GetChildCount(), new_title, new_url); @@ -557,7 +557,7 @@ static const BookmarkNode* CreateNewNode(BookmarkModel* model, const BookmarkNode* ApplyEditsWithNoGroupChange(BookmarkModel* model, const BookmarkNode* parent, const BookmarkEditor::EditDetails& details, - const std::wstring& new_title, const GURL& new_url) { + const string16& new_title, const GURL& new_url) { if (details.type == BookmarkEditor::EditDetails::NEW_URL || details.type == BookmarkEditor::EditDetails::NEW_FOLDER) { return CreateNewNode(model, parent, details, new_title, new_url); @@ -575,7 +575,7 @@ const BookmarkNode* ApplyEditsWithNoGroupChange(BookmarkModel* model, const BookmarkNode* ApplyEditsWithPossibleGroupChange(BookmarkModel* model, const BookmarkNode* new_parent, const BookmarkEditor::EditDetails& details, - const std::wstring& new_title, const GURL& new_url) { + const string16& new_title, const GURL& new_url) { if (details.type == BookmarkEditor::EditDetails::NEW_URL || details.type == BookmarkEditor::EditDetails::NEW_FOLDER) { return CreateNewNode(model, new_parent, details, new_title, new_url); diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h index e242e85..3f03710 100644 --- a/chrome/browser/bookmarks/bookmark_utils.h +++ b/chrome/browser/bookmarks/bookmark_utils.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/string16.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/history/snippet.h" @@ -165,7 +166,7 @@ const BookmarkNode* ApplyEditsWithNoGroupChange( BookmarkModel* model, const BookmarkNode* parent, const BookmarkEditor::EditDetails& details, - const std::wstring& new_title, + const string16& new_title, const GURL& new_url); // Modifies a bookmark node assuming that the parent of the node may have @@ -176,7 +177,7 @@ const BookmarkNode* ApplyEditsWithPossibleGroupChange( BookmarkModel* model, const BookmarkNode* new_parent, const BookmarkEditor::EditDetails& details, - const std::wstring& new_title, + const string16& new_title, const GURL& new_url); // Toggles whether the bookmark bar is shown only on the new tab page or on diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc index fc5f3cc..5fec3e5 100644 --- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc @@ -17,13 +17,13 @@ typedef testing::Test BookmarkUtilsTest; TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) { BookmarkModel model(NULL); const BookmarkNode* n1 = - model.AddURL(model.other_node(), 0, L"foo bar", + model.AddURL(model.other_node(), 0, ASCIIToUTF16("foo bar"), GURL("http://www.google.com")); const BookmarkNode* n2 = - model.AddURL(model.other_node(), 0, L"baz buz", + model.AddURL(model.other_node(), 0, ASCIIToUTF16("baz buz"), GURL("http://www.cnn.com")); - model.AddGroup(model.other_node(), 0, L"foo"); + model.AddGroup(model.other_node(), 0, ASCIIToUTF16("foo")); std::vector<const BookmarkNode*> nodes; bookmark_utils::GetBookmarksContainingText( @@ -53,7 +53,8 @@ TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) { TEST_F(BookmarkUtilsTest, DoesBookmarkContainText) { BookmarkModel model(NULL); - const BookmarkNode* node = model.AddURL(model.other_node(), 0, L"foo bar", + const BookmarkNode* node = model.AddURL(model.other_node(), 0, + ASCIIToUTF16("foo bar"), GURL("http://www.google.com")); // Matches to the title. ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText( @@ -67,7 +68,7 @@ TEST_F(BookmarkUtilsTest, DoesBookmarkContainText) { // Tests for a Japanese IDN. const wchar_t* kDecodedIdn = L"\x30B0\x30FC\x30B0\x30EB"; - node = model.AddURL(model.other_node(), 0, L"foo bar", + node = model.AddURL(model.other_node(), 0, ASCIIToUTF16("foo bar"), GURL("http://xn--qcka1pmc.jp")); // Unicode query doesn't match if languages have no "ja". ASSERT_FALSE(bookmark_utils::DoesBookmarkContainText( @@ -80,7 +81,7 @@ TEST_F(BookmarkUtilsTest, DoesBookmarkContainText) { node, L"qcka1pmc", L"ja")); // Tests with various lower/upper case characters. - node = model.AddURL(model.other_node(), 0, L"FOO bar", + node = model.AddURL(model.other_node(), 0, ASCIIToUTF16("FOO bar"), GURL("http://www.google.com/search?q=ABC")); ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText( node, L"foo", std::wstring())); @@ -102,7 +103,8 @@ TEST_F(BookmarkUtilsTest, CopyPaste) { MessageLoopForUI loop; BookmarkModel model(NULL); - const BookmarkNode* node = model.AddURL(model.other_node(), 0, L"foo bar", + const BookmarkNode* node = model.AddURL(model.other_node(), 0, + ASCIIToUTF16("foo bar"), GURL("http://www.google.com")); // Copy a node to the clipboard. diff --git a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm index d7acc58..05e2c27 100644 --- a/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm +++ b/chrome/browser/cocoa/applescript/bookmark_folder_applescript.mm @@ -5,6 +5,7 @@ #import "chrome/browser/cocoa/applescript/bookmark_folder_applescript.h" #import "base/scoped_nsobject.h" +#import "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/cocoa/applescript/bookmark_item_applescript.h" @@ -45,7 +46,7 @@ const BookmarkNode* node = model->AddGroup(bookmarkNode_, bookmarkNode_->GetChildCount(), - std::wstring()); + string16()); if (!node) { AppleScript::SetError(AppleScript::errCreateBookmarkFolder); return; @@ -67,7 +68,7 @@ const BookmarkNode* node = model->AddGroup(bookmarkNode_, position, - std::wstring()); + string16()); if (!node) { AppleScript::SetError(AppleScript::errCreateBookmarkFolder); return; diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm b/chrome/browser/cocoa/bookmark_all_tabs_controller.mm index 2d8184a..97269dc 100644 --- a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm +++ b/chrome/browser/cocoa/bookmark_all_tabs_controller.mm @@ -4,6 +4,7 @@ #import "chrome/browser/cocoa/bookmark_all_tabs_controller.h" #include "app/l10n_util_mac.h" +#include "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" @@ -60,7 +61,7 @@ int newIndex = newParentNode->GetChildCount(); // Create the new folder which will contain all of the tab URLs. NSString* newFolderName = [self displayName]; - std::wstring newFolderString = base::SysNSStringToWide(newFolderName); + string16 newFolderString = base::SysNSStringToUTF16(newFolderName); BookmarkModel* model = [self bookmarkModel]; const BookmarkNode* newFolder = model->AddGroup(newParentNode, newIndex, newFolderString); diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm index f562f56..c2cb712 100644 --- a/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm @@ -6,6 +6,7 @@ #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/cocoa/bookmark_all_tabs_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" @@ -42,10 +43,10 @@ class BookmarkAllTabsControllerTest : public CocoaTest { BookmarkAllTabsControllerTest() { BookmarkModel& model(*(helper_.profile()->GetBookmarkModel())); const BookmarkNode* root = model.GetBookmarkBarNode(); - group_a_ = model.AddGroup(root, 0, L"a"); - model.AddURL(group_a_, 0, L"a-0", GURL("http://a-0.com")); - model.AddURL(group_a_, 1, L"a-1", GURL("http://a-1.com")); - model.AddURL(group_a_, 2, L"a-2", GURL("http://a-2.com")); + group_a_ = model.AddGroup(root, 0, ASCIIToUTF16("a")); + model.AddURL(group_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com")); + model.AddURL(group_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com")); + model.AddURL(group_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com")); } virtual BookmarkAllTabsControllerOverride* CreateController() { @@ -76,6 +77,6 @@ TEST_F(BookmarkAllTabsControllerTest, BookmarkAllTabs) { [controller_ ok:nil]; EXPECT_EQ(4, group_a_->GetChildCount()); const BookmarkNode* folderChild = group_a_->GetChild(3); - EXPECT_EQ(folderChild->GetTitle(), L"ALL MY TABS"); + EXPECT_EQ(folderChild->GetTitleAsString16(), ASCIIToUTF16("ALL MY TABS")); EXPECT_EQ(3, folderChild->GetChildCount()); } diff --git a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm index 48174c4..494b58d 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm @@ -320,7 +320,7 @@ class BookmarkBarControllerTest : public BookmarkBarControllerTestBase { BookmarkModel* model = helper_.profile()->GetBookmarkModel(); const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* node = model->AddURL(parent, parent->GetChildCount(), - L"A title", gurl); + ASCIIToUTF16("A title"), gurl); [menu_ setRepresentedObject:[NSNumber numberWithLongLong:node->id()]]; return menu_item_; } @@ -516,7 +516,7 @@ TEST_F(BookmarkBarControllerTest, NoItemContainerGoesAway) { EXPECT_FALSE([noItemContainer isHidden]); const BookmarkNode* node = model->AddURL(bar, bar->GetChildCount(), - L"title", + ASCIIToUTF16("title"), GURL("http://www.google.com")); EXPECT_TRUE([noItemContainer isHidden]); model->Remove(bar, bar->IndexOfChild(node)); @@ -525,7 +525,7 @@ TEST_F(BookmarkBarControllerTest, NoItemContainerGoesAway) { // Now try it using a bookmark from the Other Bookmarks. const BookmarkNode* otherBookmarks = model->other_node(); node = model->AddURL(otherBookmarks, otherBookmarks->GetChildCount(), - L"TheOther", + ASCIIToUTF16("TheOther"), GURL("http://www.other.com")); EXPECT_FALSE([noItemContainer isHidden]); // Move it from Other Bookmarks to the bar. @@ -553,7 +553,7 @@ TEST_F(BookmarkBarControllerTest, OffTheSideButtonHidden) { const BookmarkNode* parent = model->GetBookmarkBarNode(); for (int i = 0; i < 20; i++) { model->AddURL(parent, parent->GetChildCount(), - L"super duper wide title", + ASCIIToUTF16("super duper wide title"), GURL("http://superfriends.hall-of-justice.edu")); } EXPECT_FALSE([bar_ offTheSideButtonIsHidden]); @@ -707,11 +707,11 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* folder = model->AddGroup(parent, parent->GetChildCount(), - L"group"); + ASCIIToUTF16("group")); model->AddURL(folder, folder->GetChildCount(), - L"f1", GURL("http://framma-lamma.com")); + ASCIIToUTF16("f1"), GURL("http://framma-lamma.com")); model->AddURL(folder, folder->GetChildCount(), - L"f2", GURL("http://framma-lamma-ding-dong.com")); + ASCIIToUTF16("f2"), GURL("http://framma-lamma-ding-dong.com")); menu = [bar_ menuForFolderNode:model->GetBookmarkBarNode()]; EXPECT_EQ([menu numberOfItems], 3); @@ -820,7 +820,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonLimits) { // Add one; make sure we see it. const BookmarkNode* parent = model->GetBookmarkBarNode(); model->AddURL(parent, parent->GetChildCount(), - L"title", GURL("http://www.google.com")); + ASCIIToUTF16("title"), GURL("http://www.google.com")); EXPECT_EQ(1U, [[bar_ buttons] count]); // Add 30 which we expect to be 'too many'. Make sure we don't see @@ -829,7 +829,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonLimits) { EXPECT_EQ(0U, [[bar_ buttons] count]); for (int i=0; i<30; i++) { model->AddURL(parent, parent->GetChildCount(), - L"title", GURL("http://www.google.com")); + ASCIIToUTF16("title"), GURL("http://www.google.com")); } int count = [[bar_ buttons] count]; EXPECT_LT(count, 30L); @@ -838,7 +838,7 @@ TEST_F(BookmarkBarControllerTest, TestButtonLimits) { // would change) and make sure the count stays the same. for (int i=0; i<10; i++) { model->AddURL(parent, 0, /* index is 0, so front, not end */ - L"title", GURL("http://www.google.com")); + ASCIIToUTF16("title"), GURL("http://www.google.com")); } // Finally, grow the view and make sure the button count goes up. @@ -909,7 +909,7 @@ TEST_F(BookmarkBarControllerTest, DeleteBookmark) { const BookmarkNode* parent = model->GetBookmarkBarNode(); for (unsigned int i = 0; i < arraysize(urls); i++) { model->AddURL(parent, parent->GetChildCount(), - L"title", GURL(urls[i])); + ASCIIToUTF16("title"), GURL(urls[i])); } EXPECT_EQ(3, parent->GetChildCount()); const BookmarkNode* middle_node = parent->GetChild(1); @@ -931,7 +931,7 @@ TEST_F(BookmarkBarControllerTest, Cell) { const BookmarkNode* parent = model->GetBookmarkBarNode(); model->AddURL(parent, parent->GetChildCount(), - L"supertitle", + ASCIIToUTF16("supertitle"), GURL("http://superfriends.hall-of-justice.edu")); const BookmarkNode* node = parent->GetChild(0); @@ -981,7 +981,7 @@ TEST_F(BookmarkBarControllerTest, HidesHelpMessageWithBookmark) { const BookmarkNode* parent = model->GetBookmarkBarNode(); model->AddURL(parent, parent->GetChildCount(), - L"title", GURL("http://one.com")); + ASCIIToUTF16("title"), GURL("http://one.com")); [bar_ loaded:model]; EXPECT_TRUE([[[bar_ buttonView] noItemContainer] isHidden]); @@ -992,7 +992,7 @@ TEST_F(BookmarkBarControllerTest, BookmarkButtonSizing) { const BookmarkNode* parent = model->GetBookmarkBarNode(); model->AddURL(parent, parent->GetChildCount(), - L"title", GURL("http://one.com")); + ASCIIToUTF16("title"), GURL("http://one.com")); [bar_ loaded:model]; @@ -1083,7 +1083,7 @@ TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* folder = model->AddGroup(parent, parent->GetChildCount(), - L"group"); + ASCIIToUTF16("group")); NSButton* button = [[bar_ buttons] objectAtIndex:0]; EXPECT_TRUE(button); @@ -1100,7 +1100,7 @@ TEST_F(BookmarkBarControllerTest, TestMenuNodeAndDisable) { // Now add a child and make sure the item would be enabled. model->AddURL(folder, folder->GetChildCount(), - L"super duper wide title", + ASCIIToUTF16("super duper wide title"), GURL("http://superfriends.hall-of-justice.edu")); EXPECT_TRUE([bar_ validateUserInterfaceItem:item]); } @@ -1158,9 +1158,10 @@ TEST_F(BookmarkBarControllerTest, TestDragButton) { // A drop on a folder button. const BookmarkNode* folder = model->AddGroup(model->GetBookmarkBarNode(), 0, - L"awesome group"); + ASCIIToUTF16("awesome group")); DCHECK(folder); - model->AddURL(folder, 0, L"already", GURL("http://www.google.com")); + model->AddURL(folder, 0, ASCIIToUTF16("already"), + GURL("http://www.google.com")); EXPECT_EQ(arraysize(titles) + 1, [[bar_ buttons] count]); EXPECT_EQ(1, folder->GetChildCount()); x = NSMidX([[[bar_ buttons] objectAtIndex:0] frame]); @@ -1274,10 +1275,11 @@ TEST_F(BookmarkBarControllerTest, TestFolders) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* folder = model->AddGroup(parent, parent->GetChildCount(), - L"group"); + ASCIIToUTF16("group")); model->AddURL(folder, folder->GetChildCount(), - L"f1", GURL("http://framma-lamma.com")); - folder = model->AddGroup(parent, parent->GetChildCount(), L"empty"); + ASCIIToUTF16("f1"), GURL("http://framma-lamma.com")); + folder = model->AddGroup(parent, parent->GetChildCount(), + ASCIIToUTF16("empty")); EXPECT_EQ([[bar_ buttons] count], 2U); @@ -1322,7 +1324,7 @@ TEST_F(BookmarkBarControllerTest, TestFolderButtons) { // Add a real bookmark so we can click on it. const BookmarkNode* folder = root->GetChild(3); - model.AddURL(folder, folder->GetChildCount(), L"CLICK ME", + model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("CLICK ME"), GURL("http://www.google.com/")); // Click on a folder button. @@ -1386,13 +1388,15 @@ TEST_F(BookmarkBarControllerTest, OffTheSideFolder) { const BookmarkNode* parent = model->GetBookmarkBarNode(); for (int x = 0; x < 30; x++) { model->AddURL(parent, parent->GetChildCount(), - L"medium-size-title", GURL("http://framma-lamma.com")); + ASCIIToUTF16("medium-size-title"), + GURL("http://framma-lamma.com")); } // Add a couple more so we can delete one and make sure its button goes away. model->AddURL(parent, parent->GetChildCount(), - L"DELETE_ME", GURL("http://ashton-tate.com")); + ASCIIToUTF16("DELETE_ME"), GURL("http://ashton-tate.com")); model->AddURL(parent, parent->GetChildCount(), - L"medium-size-title", GURL("http://framma-lamma.com")); + ASCIIToUTF16("medium-size-title"), + GURL("http://framma-lamma.com")); // Should no longer be hidden. EXPECT_FALSE([bar_ offTheSideButtonIsHidden]); @@ -1461,8 +1465,8 @@ TEST_F(BookmarkBarControllerTest, DropDestination) { // Make some buttons. BookmarkModel* model = helper_.profile()->GetBookmarkModel(); const BookmarkNode* parent = model->GetBookmarkBarNode(); - model->AddGroup(parent, parent->GetChildCount(), L"group 1"); - model->AddGroup(parent, parent->GetChildCount(), L"group 2"); + model->AddGroup(parent, parent->GetChildCount(), ASCIIToUTF16("group 1")); + model->AddGroup(parent, parent->GetChildCount(), ASCIIToUTF16("group 2")); EXPECT_EQ([[bar_ buttons] count], 2U); // Confirm "off to left" and "off to right" match nothing. @@ -1503,7 +1507,7 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileMenuIsOpen) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* initialNode = model->AddURL( parent, parent->GetChildCount(), - L"initial", + ASCIIToUTF16("initial"), GURL("http://www.google.com")); NSMenuItem* item = ItemForBookmarkBarMenu(initialNode); @@ -1542,9 +1546,9 @@ TEST_F(BookmarkBarControllerTest, NodeDeletedWhileContextMenuIsOpen) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* folder = model->AddGroup(parent, parent->GetChildCount(), - L"group"); + ASCIIToUTF16("group")); const BookmarkNode* framma = model->AddURL(folder, folder->GetChildCount(), - L"f1", + ASCIIToUTF16("f1"), GURL("http://framma-lamma.com")); // Mock in a menu @@ -1566,14 +1570,14 @@ TEST_F(BookmarkBarControllerTest, CloseFolderOnAnimate) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* folder = model->AddGroup(parent, parent->GetChildCount(), - L"group"); + ASCIIToUTF16("group")); model->AddGroup(parent, parent->GetChildCount(), - L"sibbling group"); - model->AddURL(folder, folder->GetChildCount(), L"title a", + ASCIIToUTF16("sibbling group")); + model->AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("title a"), GURL("http://www.google.com/a")); model->AddURL(folder, folder->GetChildCount(), - L"title super duper long long whoa momma title you betcha", - GURL("http://www.google.com/b")); + ASCIIToUTF16("title super duper long long whoa momma title you betcha"), + GURL("http://www.google.com/b")); BookmarkButton* button = [[bar_ buttons] objectAtIndex:0]; EXPECT_FALSE([bar_ folderController]); [bar_ openBookmarkFolderFromButton:button]; @@ -1688,15 +1692,16 @@ public: BookmarkModel* model = helper_.profile()->GetBookmarkModel(); parent_ = model->GetBookmarkBarNode(); // { one, { two-one, two-two }, three } - model->AddURL(parent_, parent_->GetChildCount(), L"title", + model->AddURL(parent_, parent_->GetChildCount(), ASCIIToUTF16("title"), GURL("http://one.com")); - folder_ = model->AddGroup(parent_, parent_->GetChildCount(), L"group"); + folder_ = model->AddGroup(parent_, parent_->GetChildCount(), + ASCIIToUTF16("group")); model->AddURL(folder_, folder_->GetChildCount(), - L"title", GURL("http://two-one.com")); + ASCIIToUTF16("title"), GURL("http://two-one.com")); model->AddURL(folder_, folder_->GetChildCount(), - L"title", GURL("http://two-two.com")); + ASCIIToUTF16("title"), GURL("http://two-two.com")); model->AddURL(parent_, parent_->GetChildCount(), - L"title", GURL("https://three.com")); + ASCIIToUTF16("title"), GURL("https://three.com")); } const BookmarkNode* parent_; // Weak const BookmarkNode* folder_; // Weak @@ -2042,7 +2047,7 @@ TEST_F(BookmarkBarControllerDragDropTest, PulseButton) { const BookmarkNode* root = model->GetBookmarkBarNode(); GURL gurl("http://www.google.com"); const BookmarkNode* node = model->AddURL(root, root->GetChildCount(), - L"title", gurl); + ASCIIToUTF16("title"), gurl); BookmarkButton* button = [[bar_ buttons] objectAtIndex:0]; EXPECT_FALSE([button isContinuousPulsing]); diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm index 555a3c9..fc7e80b 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm @@ -6,6 +6,7 @@ #include "base/basictypes.h" #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/cocoa/bookmark_bar_constants.h" // namespace bookmarks #import "chrome/browser/cocoa/bookmark_bar_controller.h" @@ -132,23 +133,23 @@ class BookmarkBarFolderControllerTest : public CocoaTest { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* folderA = model->AddGroup(parent, parent->GetChildCount(), - L"group"); + ASCIIToUTF16("group")); folderA_ = folderA; model->AddGroup(parent, parent->GetChildCount(), - L"sibbling group"); + ASCIIToUTF16("sibbling group")); const BookmarkNode* folderB = model->AddGroup(folderA, folderA->GetChildCount(), - L"subgroup 1"); + ASCIIToUTF16("subgroup 1")); model->AddGroup(folderA, folderA->GetChildCount(), - L"subgroup 2"); - model->AddURL(folderA, folderA->GetChildCount(), L"title a", + ASCIIToUTF16("subgroup 2")); + model->AddURL(folderA, folderA->GetChildCount(), ASCIIToUTF16("title a"), GURL("http://www.google.com/a")); longTitleNode_ = model->AddURL( folderA, folderA->GetChildCount(), - L"title super duper long long whoa momma title you betcha", + ASCIIToUTF16("title super duper long long whoa momma title you betcha"), GURL("http://www.google.com/b")); - model->AddURL(folderB, folderB->GetChildCount(), L"t", + model->AddURL(folderB, folderB->GetChildCount(), ASCIIToUTF16("t"), GURL("http://www.google.com/c")); bar_.reset( @@ -180,7 +181,8 @@ class BookmarkBarFolderControllerTest : public CocoaTest { int AddLotsOfNodes() { BookmarkModel* model = helper_.profile()->GetBookmarkModel(); for (int i = 0; i < kLotsOfNodesCount; i++) { - model->AddURL(folderA_, folderA_->GetChildCount(), L"repeated title", + model->AddURL(folderA_, folderA_->GetChildCount(), + ASCIIToUTF16("repeated title"), GURL("http://www.google.com/repeated/url")); } return kLotsOfNodesCount; @@ -291,7 +293,7 @@ TEST_F(BookmarkBarFolderControllerTest, PositionRightLeftRight) { int i; // Make some super duper deeply nested folders. for (i=0; i<count; i++) { - folder = model->AddGroup(folder, 0, L"nested folder"); + folder = model->AddGroup(folder, 0, ASCIIToUTF16("nested folder")); } // Setup initial state for opening all folders. @@ -1121,7 +1123,7 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) { const BookmarkNode* parent = model.GetBookmarkBarNode(); const BookmarkNode* folder = model.AddGroup(parent, parent->GetChildCount(), - L"BIG"); + ASCIIToUTF16("BIG")); // Pop open the new folder window and verify it has one (empty) item. BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"BIG"]; @@ -1139,7 +1141,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) { EXPECT_FALSE([folderController scrollable]); // Now add a real bookmark and reopen. - model.AddURL(folder, folder->GetChildCount(), L"a", GURL("http://a.com/")); + model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("a"), + GURL("http://a.com/")); folderController = [bar_ folderController]; EXPECT_TRUE(folderController); folderMenu = [folderController window]; @@ -1156,7 +1159,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) { EXPECT_CGFLOAT_EQ(expectedWidth, menuWidth); // Add a wider bookmark and make sure the button widths match. - model.AddURL(folder, folder->GetChildCount(), L"A really, really long name", + model.AddURL(folder, folder->GetChildCount(), + ASCIIToUTF16("A really, really long name"), GURL("http://www.google.com/a")); EXPECT_LT(menuWidth, NSWidth([folderMenu frame])); EXPECT_LT(buttonWidth, NSWidth([button frame])); @@ -1172,7 +1176,8 @@ TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) { menuHeight = NSHeight([folderMenu frame]); NSUInteger tripWire = 0; // Prevent a runaway. while (![folderController scrollable] && ++tripWire < 100) { - model.AddURL(folder, folder->GetChildCount(), L"B", GURL("http://b.com/")); + model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("B"), + GURL("http://b.com/")); oldMenuHeight = menuHeight; menuHeight = NSHeight([folderMenu frame]); } @@ -1199,9 +1204,9 @@ TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) { const BookmarkNode* root = model.GetBookmarkBarNode(); const BookmarkNode* folder = model.AddGroup(root, root->GetChildCount(), - L"BIG"); + ASCIIToUTF16("BIG")); for (int i = 0; i < kLotsOfNodesCount; i++) - model.AddURL(folder, folder->GetChildCount(), L"kid", + model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("kid"), GURL("http://kid.com/smile")); // Pop open the new folder window and hover one of its kids. diff --git a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm index ffe036d..7dd01d9 100644 --- a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm @@ -1,4 +1,4 @@ -// 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. @@ -6,6 +6,7 @@ #include "base/basictypes.h" #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/cocoa/bookmark_bubble_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "chrome/browser/cocoa/browser_window_controller.h" @@ -105,7 +106,7 @@ TEST_F(BookmarkBubbleControllerTest, TestBubbleWindow) { BookmarkModel* model = GetBookmarkModel(); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), 0, - L"Bookie markie title", + ASCIIToUTF16("Bookie markie title"), GURL("http://www.google.com")); BookmarkBubbleController* controller = ControllerForNode(node); EXPECT_TRUE(controller); @@ -120,7 +121,7 @@ TEST_F(BookmarkBubbleControllerTest, TestClosingParentWindow) { BookmarkModel* model = GetBookmarkModel(); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), 0, - L"Bookie markie title", + ASCIIToUTF16("Bookie markie title"), GURL("http://www.google.com")); BookmarkBubbleController* controller = ControllerForNode(node); EXPECT_TRUE(controller); @@ -138,22 +139,25 @@ TEST_F(BookmarkBubbleControllerTest, TestFillInFolder) { EXPECT_TRUE(model); const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode(); EXPECT_TRUE(bookmarkBarNode); - const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, L"one"); + const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("one")); EXPECT_TRUE(node1); - const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 1, L"two"); + const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 1, + ASCIIToUTF16("two")); EXPECT_TRUE(node2); - const BookmarkNode* node3 = model->AddGroup(bookmarkBarNode, 2, L"three"); + const BookmarkNode* node3 = model->AddGroup(bookmarkBarNode, 2, + ASCIIToUTF16("three")); EXPECT_TRUE(node3); - const BookmarkNode* node4 = model->AddGroup(node2, 0, L"sub"); + const BookmarkNode* node4 = model->AddGroup(node2, 0, ASCIIToUTF16("sub")); EXPECT_TRUE(node4); - const BookmarkNode* node5 = - model->AddURL(node1, 0, L"title1", GURL("http://www.google.com")); + const BookmarkNode* node5 = model->AddURL(node1, 0, ASCIIToUTF16("title1"), + GURL("http://www.google.com")); EXPECT_TRUE(node5); - const BookmarkNode* node6 = - model->AddURL(node3, 0, L"title2", GURL("http://www.google.com")); + const BookmarkNode* node6 = model->AddURL(node3, 0, ASCIIToUTF16("title2"), + GURL("http://www.google.com")); EXPECT_TRUE(node6); - const BookmarkNode* node7 = - model->AddURL(node4, 0, L"title3", GURL("http://www.google.com/reader")); + const BookmarkNode* node7 = model->AddURL(node4, 0, ASCIIToUTF16("title3"), + GURL("http://www.google.com/reader")); EXPECT_TRUE(node7); BookmarkBubbleController* controller = ControllerForNode(node4); @@ -176,14 +180,17 @@ TEST_F(BookmarkBubbleControllerTest, TestFolderWithBlankName) { EXPECT_TRUE(model); const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode(); EXPECT_TRUE(bookmarkBarNode); - const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, L"one"); + const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("one")); EXPECT_TRUE(node1); - const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 1, L""); + const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 1, + ASCIIToUTF16("")); EXPECT_TRUE(node2); - const BookmarkNode* node3 = model->AddGroup(bookmarkBarNode, 2, L"three"); + const BookmarkNode* node3 = model->AddGroup(bookmarkBarNode, 2, + ASCIIToUTF16("three")); EXPECT_TRUE(node3); - const BookmarkNode* node2_1 = - model->AddURL(node2, 0, L"title1", GURL("http://www.google.com")); + const BookmarkNode* node2_1 = model->AddURL(node2, 0, ASCIIToUTF16("title1"), + GURL("http://www.google.com")); EXPECT_TRUE(node2_1); BookmarkBubbleController* controller = ControllerForNode(node1); @@ -210,7 +217,7 @@ TEST_F(BookmarkBubbleControllerTest, TestEdit) { BookmarkModel* model = GetBookmarkModel(); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), 0, - L"Bookie markie title", + ASCIIToUTF16("Bookie markie title"), GURL("http://www.google.com")); BookmarkBubbleController* controller = ControllerForNode(node); EXPECT_TRUE(controller); @@ -226,10 +233,9 @@ TEST_F(BookmarkBubbleControllerTest, TestEdit) { // Also confirm pulse notifications get sent. TEST_F(BookmarkBubbleControllerTest, TestClose) { BookmarkModel* model = GetBookmarkModel(); - const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), - 0, - L"Bookie markie title", - GURL("http://www.google.com")); + const BookmarkNode* node = model->AddURL( + model->GetBookmarkBarNode(), 0, ASCIIToUTF16("Bookie markie title"), + GURL("http://www.google.com")); EXPECT_EQ(edits_, 0); scoped_nsobject<BookmarkPulseObserver> observer([[BookmarkPulseObserver alloc] @@ -253,11 +259,13 @@ TEST_F(BookmarkBubbleControllerTest, TestUserEdit) { EXPECT_TRUE(bookmarkBarNode); const BookmarkNode* node = model->AddURL(bookmarkBarNode, 0, - L"short-title", + ASCIIToUTF16("short-title"), GURL("http://www.google.com")); - const BookmarkNode* grandma = model->AddGroup(bookmarkBarNode, 0, L"grandma"); + const BookmarkNode* grandma = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("grandma")); EXPECT_TRUE(grandma); - const BookmarkNode* grandpa = model->AddGroup(bookmarkBarNode, 0, L"grandpa"); + const BookmarkNode* grandpa = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("grandpa")); EXPECT_TRUE(grandpa); BookmarkBubbleController* controller = ControllerForNode(node); @@ -268,8 +276,8 @@ TEST_F(BookmarkBubbleControllerTest, TestUserEdit) { [controller edit:controller]; // Make sure bookmark has changed - EXPECT_EQ(node->GetTitle(), L"oops"); - EXPECT_EQ(node->GetParent()->GetTitle(), L"grandma"); + EXPECT_EQ(node->GetTitleAsString16(), ASCIIToUTF16("oops")); + EXPECT_EQ(node->GetParent()->GetTitleAsString16(), ASCIIToUTF16("grandma")); } // Confirm happiness with parent nodes that have the same name. @@ -281,14 +289,15 @@ TEST_F(BookmarkBubbleControllerTest, TestNewParentSameName) { for (int i=0; i<2; i++) { const BookmarkNode* node = model->AddURL(bookmarkBarNode, 0, - L"short-title", + ASCIIToUTF16("short-title"), GURL("http://www.google.com")); EXPECT_TRUE(node); - const BookmarkNode* group = model->AddGroup(bookmarkBarNode, 0, L"NAME"); + const BookmarkNode* group = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("NAME")); EXPECT_TRUE(group); - group = model->AddGroup(bookmarkBarNode, 0, L"NAME"); + group = model->AddGroup(bookmarkBarNode, 0, ASCIIToUTF16("NAME")); EXPECT_TRUE(group); - group = model->AddGroup(bookmarkBarNode, 0, L"NAME"); + group = model->AddGroup(bookmarkBarNode, 0, ASCIIToUTF16("NAME")); EXPECT_TRUE(group); BookmarkBubbleController* controller = ControllerForNode(node); EXPECT_TRUE(controller); @@ -308,9 +317,11 @@ TEST_F(BookmarkBubbleControllerTest, TestDuplicateNodeNames) { BookmarkModel* model = GetBookmarkModel(); const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode(); EXPECT_TRUE(bookmarkBarNode); - const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, L"NAME"); + const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("NAME")); EXPECT_TRUE(node1); - const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 0, L"NAME"); + const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("NAME")); EXPECT_TRUE(node2); BookmarkBubbleController* controller = ControllerForNode(bookmarkBarNode); EXPECT_TRUE(controller); @@ -332,7 +343,7 @@ TEST_F(BookmarkBubbleControllerTest, TestRemove) { GURL gurl("http://www.google.com"); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), 0, - L"Bookie markie title", + ASCIIToUTF16("Bookie markie title"), gurl); BookmarkBubbleController* controller = ControllerForNode(node); EXPECT_TRUE(controller); @@ -348,7 +359,7 @@ TEST_F(BookmarkBubbleControllerTest, PopUpSelectionChanged) { BookmarkModel* model = GetBookmarkModel(); GURL gurl("http://www.google.com"); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), - 0, L"super-title", + 0, ASCIIToUTF16("super-title"), gurl); BookmarkBubbleController* controller = ControllerForNode(node); EXPECT_TRUE(controller); @@ -368,7 +379,7 @@ TEST_F(BookmarkBubbleControllerTest, EscapeRemovesNewBookmark) { GURL gurl("http://www.google.com"); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), 0, - L"Bookie markie title", + ASCIIToUTF16("Bookie markie title"), gurl); BookmarkBubbleController* controller = [[BookmarkBubbleController alloc] @@ -390,7 +401,7 @@ TEST_F(BookmarkBubbleControllerTest, EscapeDoesntTouchExistingBookmark) { GURL gurl("http://www.google.com"); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), 0, - L"Bookie markie title", + ASCIIToUTF16("Bookie markie title"), gurl); BookmarkBubbleController* controller = ControllerForNode(node); EXPECT_TRUE(controller); @@ -406,13 +417,17 @@ TEST_F(BookmarkBubbleControllerTest, TestMenuIndentation) { EXPECT_TRUE(model); const BookmarkNode* bookmarkBarNode = model->GetBookmarkBarNode(); EXPECT_TRUE(bookmarkBarNode); - const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, L"one"); + const BookmarkNode* node1 = model->AddGroup(bookmarkBarNode, 0, + ASCIIToUTF16("one")); EXPECT_TRUE(node1); - const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 1, L"two"); + const BookmarkNode* node2 = model->AddGroup(bookmarkBarNode, 1, + ASCIIToUTF16("two")); EXPECT_TRUE(node2); - const BookmarkNode* node2_1 = model->AddGroup(node2, 0, L"two dot one"); + const BookmarkNode* node2_1 = model->AddGroup(node2, 0, + ASCIIToUTF16("two dot one")); EXPECT_TRUE(node2_1); - const BookmarkNode* node3 = model->AddGroup(bookmarkBarNode, 2, L"three"); + const BookmarkNode* node3 = model->AddGroup(bookmarkBarNode, 2, + ASCIIToUTF16("three")); EXPECT_TRUE(node3); BookmarkBubbleController* controller = ControllerForNode(node1); @@ -435,7 +450,7 @@ TEST_F(BookmarkBubbleControllerTest, BubbleGoesAwayOnNewTab) { BookmarkModel* model = GetBookmarkModel(); const BookmarkNode* node = model->AddURL(model->GetBookmarkBarNode(), 0, - L"Bookie markie title", + ASCIIToUTF16("Bookie markie title"), GURL("http://www.google.com")); EXPECT_EQ(edits_, 0); diff --git a/chrome/browser/cocoa/bookmark_editor_base_controller.mm b/chrome/browser/cocoa/bookmark_editor_base_controller.mm index af88ea7..a431c20 100644 --- a/chrome/browser/cocoa/bookmark_editor_base_controller.mm +++ b/chrome/browser/cocoa/bookmark_editor_base_controller.mm @@ -463,7 +463,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver { BookmarkModel* model = [self bookmarkModel]; const BookmarkNode* newFolder = model->AddGroup(parentNode, i, - base::SysNSStringToWide([subFolderInfo folderName])); + base::SysNSStringToUTF16([subFolderInfo folderName])); // Update our dictionary with the actual folder node just created. [subFolderInfo setFolderNode:newFolder]; [subFolderInfo setNewFolder:NO]; diff --git a/chrome/browser/cocoa/bookmark_editor_base_controller_unittest.mm b/chrome/browser/cocoa/bookmark_editor_base_controller_unittest.mm index 2550aec..363461b 100644 --- a/chrome/browser/cocoa/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_editor_base_controller_unittest.mm @@ -7,6 +7,7 @@ #include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/cocoa/bookmark_editor_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" @@ -39,28 +40,28 @@ class BookmarkEditorBaseControllerTest : public CocoaTest { // b-4 BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel())); const BookmarkNode* root = model.GetBookmarkBarNode(); - group_a_ = model.AddGroup(root, 0, L"a"); - model.AddURL(group_a_, 0, L"a-0", GURL("http://a-0.com")); - model.AddURL(group_a_, 1, L"a-1", GURL("http://a-1.com")); - model.AddURL(group_a_, 2, L"a-2", GURL("http://a-2.com")); - - group_b_ = model.AddGroup(root, 1, L"b"); - group_b_0_ = model.AddGroup(group_b_, 0, L"b-0"); - model.AddURL(group_b_0_, 0, L"bb-0", GURL("http://bb-0.com")); - model.AddURL(group_b_, 1, L"b-1", GURL("http://b-1.com")); - model.AddURL(group_b_, 2, L"b-2", GURL("http://b-2.com")); - group_b_3_ = model.AddGroup(group_b_, 3, L"b-3"); - model.AddURL(group_b_3_, 0, L"b-30", GURL("http://b-30.com")); - model.AddURL(group_b_3_, 1, L"b-31", GURL("http://b-31.com")); - model.AddURL(group_b_, 4, L"b-4", GURL("http://b-4.com")); - - group_c_ = model.AddGroup(root, 2, L"c"); - model.AddURL(group_c_, 0, L"c-0", GURL("http://c-0.com")); - model.AddURL(group_c_, 1, L"c-1", GURL("http://c-1.com")); - model.AddURL(group_c_, 2, L"c-2", GURL("http://c-2.com")); - model.AddURL(group_c_, 3, L"c-3", GURL("http://c-3.com")); - - model.AddURL(root, 3, L"d", GURL("http://d-0.com")); + group_a_ = model.AddGroup(root, 0, ASCIIToUTF16("a")); + model.AddURL(group_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com")); + model.AddURL(group_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com")); + model.AddURL(group_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com")); + + group_b_ = model.AddGroup(root, 1, ASCIIToUTF16("b")); + group_b_0_ = model.AddGroup(group_b_, 0, ASCIIToUTF16("b-0")); + model.AddURL(group_b_0_, 0, ASCIIToUTF16("bb-0"), GURL("http://bb-0.com")); + model.AddURL(group_b_, 1, ASCIIToUTF16("b-1"), GURL("http://b-1.com")); + model.AddURL(group_b_, 2, ASCIIToUTF16("b-2"), GURL("http://b-2.com")); + group_b_3_ = model.AddGroup(group_b_, 3, ASCIIToUTF16("b-3")); + model.AddURL(group_b_3_, 0, ASCIIToUTF16("b-30"), GURL("http://b-30.com")); + model.AddURL(group_b_3_, 1, ASCIIToUTF16("b-31"), GURL("http://b-31.com")); + model.AddURL(group_b_, 4, ASCIIToUTF16("b-4"), GURL("http://b-4.com")); + + group_c_ = model.AddGroup(root, 2, ASCIIToUTF16("c")); + model.AddURL(group_c_, 0, ASCIIToUTF16("c-0"), GURL("http://c-0.com")); + model.AddURL(group_c_, 1, ASCIIToUTF16("c-1"), GURL("http://c-1.com")); + model.AddURL(group_c_, 2, ASCIIToUTF16("c-2"), GURL("http://c-2.com")); + model.AddURL(group_c_, 3, ASCIIToUTF16("c-3"), GURL("http://c-3.com")); + + model.AddURL(root, 3, ASCIIToUTF16("d"), GURL("http://d-0.com")); } virtual BookmarkEditorBaseController* CreateController() { @@ -207,7 +208,8 @@ TEST_F(BookmarkEditorBaseControllerTest, FolderAdded) { const BookmarkNode* root = model.GetBookmarkBarNode(); // Add a group node to the model, and verify it can be selected in the tree: - const BookmarkNode* group_added = model.AddGroup(root, 0, L"added"); + const BookmarkNode* group_added = model.AddGroup(root, 0, + ASCIIToUTF16("added")); [controller_ selectTestNodeInBrowser:group_added]; EXPECT_EQ(group_added, [controller_ selectedNode]); diff --git a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm index 57b583c..87f8210 100644 --- a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm @@ -4,7 +4,9 @@ #import <Cocoa/Cocoa.h> +#include "base/string16.h" #include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #import "chrome/browser/cocoa/bookmark_editor_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" @@ -19,7 +21,7 @@ class BookmarkEditorControllerTest : public CocoaTest { const BookmarkNode* default_node_; const BookmarkNode* default_parent_; const char* default_name_; - std::wstring default_title_; + string16 default_title_; BookmarkEditorController* controller_; virtual void SetUp() { @@ -27,7 +29,7 @@ class BookmarkEditorControllerTest : public CocoaTest { BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel(); default_parent_ = model->GetBookmarkBarNode(); default_name_ = "http://www.zim-bop-a-dee.com/"; - default_title_ = L"ooh title"; + default_title_ = ASCIIToUTF16("ooh title"); const BookmarkNode* default_node = model->AddURL(default_parent_, 0, default_title_, GURL(default_name_)); @@ -50,7 +52,7 @@ TEST_F(BookmarkEditorControllerTest, NoEdit) { [controller_ cancel:nil]; ASSERT_EQ(default_parent_->GetChildCount(), 1); const BookmarkNode* child = default_parent_->GetChild(0); - EXPECT_EQ(child->GetTitle(), default_title_); + EXPECT_EQ(child->GetTitleAsString16(), default_title_); EXPECT_EQ(child->GetURL(), GURL(default_name_)); } @@ -70,7 +72,7 @@ TEST_F(BookmarkEditorControllerTest, EditURL) { [controller_ ok:nil]; ASSERT_EQ(default_parent_->GetChildCount(), 1); const BookmarkNode* child = default_parent_->GetChild(0); - EXPECT_EQ(child->GetTitle(), default_title_); + EXPECT_EQ(child->GetTitleAsString16(), default_title_); EXPECT_EQ(child->GetURL(), GURL("http://yellow-sneakers.com/")); } @@ -163,7 +165,7 @@ TEST_F(BookmarkEditorControllerNoNodeTest, NoNodeNoTree) { class BookmarkEditorControllerYesNodeTest : public CocoaTest { public: BrowserTestHelper browser_helper_; - std::wstring default_title_; + string16 default_title_; const char* url_name_; BookmarkEditorController* controller_; @@ -171,7 +173,7 @@ class BookmarkEditorControllerYesNodeTest : public CocoaTest { CocoaTest::SetUp(); BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel(); const BookmarkNode* parent = model->GetBookmarkBarNode(); - default_title_ = L"wooh title"; + default_title_ = ASCIIToUTF16("wooh title"); url_name_ = "http://www.zoom-baby-doo-da.com/"; const BookmarkNode* node = model->AddURL(parent, 0, default_title_, GURL(url_name_)); @@ -192,7 +194,7 @@ class BookmarkEditorControllerYesNodeTest : public CocoaTest { }; TEST_F(BookmarkEditorControllerYesNodeTest, YesNodeShowTree) { - EXPECT_NSEQ(base::SysWideToNSString(default_title_), + EXPECT_NSEQ(base::SysUTF16ToNSString(default_title_), [controller_ displayName]); EXPECT_NSEQ([NSString stringWithCString:url_name_ encoding:NSUTF8StringEncoding], @@ -226,35 +228,36 @@ class BookmarkEditorControllerTreeTest : public CocoaTest { // b-2 BookmarkModel& model(*(browser_helper_.profile()->GetBookmarkModel())); const BookmarkNode* root = model.GetBookmarkBarNode(); - group_a_ = model.AddGroup(root, 0, L"a"); - model.AddURL(group_a_, 0, L"a-0", GURL("http://a-0.com")); - model.AddURL(group_a_, 1, L"a-1", GURL("http://a-1.com")); - model.AddURL(group_a_, 2, L"a-2", GURL("http://a-2.com")); - - group_b_ = model.AddGroup(root, 1, L"b"); - model.AddURL(group_b_, 0, L"b-0", GURL("http://b-0.com")); - group_bb_ = model.AddGroup(group_b_, 1, L"bb"); - model.AddURL(group_bb_, 0, L"bb-0", GURL("http://bb-0.com")); - model.AddURL(group_bb_, 1, L"bb-1", GURL("http://bb-1.com")); - model.AddURL(group_bb_, 2, L"bb-2", GURL("http://bb-2.com")); + group_a_ = model.AddGroup(root, 0, ASCIIToUTF16("a")); + model.AddURL(group_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com")); + model.AddURL(group_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com")); + model.AddURL(group_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com")); + + group_b_ = model.AddGroup(root, 1, ASCIIToUTF16("b")); + model.AddURL(group_b_, 0, ASCIIToUTF16("b-0"), GURL("http://b-0.com")); + group_bb_ = model.AddGroup(group_b_, 1, ASCIIToUTF16("bb")); + model.AddURL(group_bb_, 0, ASCIIToUTF16("bb-0"), GURL("http://bb-0.com")); + model.AddURL(group_bb_, 1, ASCIIToUTF16("bb-1"), GURL("http://bb-1.com")); + model.AddURL(group_bb_, 2, ASCIIToUTF16("bb-2"), GURL("http://bb-2.com")); // To find it later, this bookmark name must always have a URL // of http://bb-3.com or https://bb-3.com bb3_url_1_ = GURL("http://bb-3.com"); bb3_url_2_ = GURL("https://bb-3.com"); - bookmark_bb_3_ = model.AddURL(group_bb_, 3, L"bb-3", bb3_url_1_); + bookmark_bb_3_ = model.AddURL(group_bb_, 3, ASCIIToUTF16("bb-3"), + bb3_url_1_); - model.AddURL(group_bb_, 4, L"bb-4", GURL("http://bb-4.com")); - model.AddURL(group_b_, 2, L"b-1", GURL("http://b-2.com")); - model.AddURL(group_b_, 3, L"b-2", GURL("http://b-3.com")); + model.AddURL(group_bb_, 4, ASCIIToUTF16("bb-4"), GURL("http://bb-4.com")); + model.AddURL(group_b_, 2, ASCIIToUTF16("b-1"), GURL("http://b-2.com")); + model.AddURL(group_b_, 3, ASCIIToUTF16("b-2"), GURL("http://b-3.com")); - group_c_ = model.AddGroup(root, 2, L"c"); - model.AddURL(group_c_, 0, L"c-0", GURL("http://c-0.com")); - model.AddURL(group_c_, 1, L"c-1", GURL("http://c-1.com")); - model.AddURL(group_c_, 2, L"c-2", GURL("http://c-2.com")); - model.AddURL(group_c_, 3, L"c-3", GURL("http://c-3.com")); + group_c_ = model.AddGroup(root, 2, ASCIIToUTF16("c")); + model.AddURL(group_c_, 0, ASCIIToUTF16("c-0"), GURL("http://c-0.com")); + model.AddURL(group_c_, 1, ASCIIToUTF16("c-1"), GURL("http://c-1.com")); + model.AddURL(group_c_, 2, ASCIIToUTF16("c-2"), GURL("http://c-2.com")); + model.AddURL(group_c_, 3, ASCIIToUTF16("c-3"), GURL("http://c-3.com")); - model.AddURL(root, 3, L"d", GURL("http://d-0.com")); + model.AddURL(root, 3, ASCIIToUTF16("d"), GURL("http://d-0.com")); } virtual BookmarkEditorController* CreateController() { diff --git a/chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm b/chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm index 4f275eb..56590ff 100644 --- a/chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm @@ -1,10 +1,13 @@ -// 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. #import <AppKit/AppKit.h> + #import "base/scoped_nsobject.h" +#include "base/string16.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" @@ -86,8 +89,7 @@ TEST_F(BookmarkMenuBridgeTest, TestBookmarkMenuAutoSeparator) { // menu contents plus a new separator and the new bookmark. const BookmarkNode* parent = model->GetBookmarkBarNode(); const char* url = "http://www.zim-bop-a-dee.com/"; - std::wstring title(L"Bookmark"); - model->AddURL(parent, 0, title, GURL(url)); + model->AddURL(parent, 0, ASCIIToUTF16("Bookmark"), GURL(url)); bridge_->UpdateMenu(menu); EXPECT_EQ(4, [menu numberOfItems]); // Remove the new bookmark and reload and we should have 2 items again @@ -139,8 +141,7 @@ TEST_F(BookmarkMenuBridgeTest, TestInvalidation) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const char* url = "http://www.zim-bop-a-dee.com/"; - std::wstring title(L"Bookmark"); - model->AddURL(parent, 0, title, GURL(url)); + model->AddURL(parent, 0, ASCIIToUTF16("Bookmark"), GURL(url)); EXPECT_FALSE(menu_is_valid()); bridge_->UpdateMenu(bridge_->menu_); @@ -150,7 +151,7 @@ TEST_F(BookmarkMenuBridgeTest, TestInvalidation) { // Test that AddNodeToMenu() properly adds bookmark nodes as menus, // including the recursive case. TEST_F(BookmarkMenuBridgeTest, TestAddNodeToMenu) { - std::wstring empty; + string16 empty; NSMenu* menu = bridge_->menu_.get(); BookmarkModel* model = bridge_->GetBookmarkModel(); @@ -166,11 +167,11 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToMenu) { // 3 nodes; middle one has a child, last one has a HUGE URL // Set their titles to be the same as the URLs const BookmarkNode* node = NULL; - model->AddURL(root, 0, ASCIIToWide(short_url), GURL(short_url)); + model->AddURL(root, 0, ASCIIToUTF16(short_url), GURL(short_url)); bridge_->UpdateMenu(menu); int prev_count = [menu numberOfItems] - 1; // "extras" added at this point node = model->AddGroup(root, 1, empty); - model->AddURL(root, 2, ASCIIToWide(long_url), GURL(long_url)); + model->AddURL(root, 2, ASCIIToUTF16(long_url), GURL(long_url)); // And the submenu fo the middle one model->AddURL(node, 0, empty, GURL("http://sub")); @@ -225,7 +226,7 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToMenu) { // Makes sure our internal map of BookmarkNode to NSMenuItem works. TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) { - std::wstring empty; + string16 empty; NSMenu* menu = bridge_->menu_.get(); BookmarkModel* model = bridge_->GetBookmarkModel(); @@ -233,11 +234,11 @@ TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) { const BookmarkNode* root = model->AddGroup(bookmark_bar, 0, empty); EXPECT_TRUE(model && root); - model->AddURL(root, 0, ASCIIToWide("Test Item"), GURL("http://test")); + model->AddURL(root, 0, ASCIIToUTF16("Test Item"), GURL("http://test")); AddNodeToMenu(bridge_.get(), root, menu); EXPECT_TRUE(MenuItemForNode(bridge_.get(), root->GetChild(0))); - model->AddURL(root, 1, ASCIIToWide("Test 2"), GURL("http://second-test")); + model->AddURL(root, 1, ASCIIToUTF16("Test 2"), GURL("http://second-test")); AddNodeToMenu(bridge_.get(), root, menu); EXPECT_TRUE(MenuItemForNode(bridge_.get(), root->GetChild(0))); EXPECT_TRUE(MenuItemForNode(bridge_.get(), root->GetChild(1))); @@ -257,7 +258,6 @@ TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) { // Test that Loaded() adds both the bookmark bar nodes and the "other" nodes. TEST_F(BookmarkMenuBridgeTest, TestAddNodeToOther) { - std::wstring empty; NSMenu* menu = bridge_->menu_.get(); BookmarkModel* model = bridge_->GetBookmarkModel(); @@ -265,7 +265,7 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToOther) { EXPECT_TRUE(model && root); const char* short_url = "http://foo/"; - model->AddURL(root, 0, ASCIIToWide(short_url), GURL(short_url)); + model->AddURL(root, 0, ASCIIToUTF16(short_url), GURL(short_url)); bridge_->UpdateMenu(menu); ASSERT_GT([menu numberOfItems], 0); @@ -277,7 +277,6 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToOther) { } TEST_F(BookmarkMenuBridgeTest, TestFavIconLoading) { - std::wstring empty; NSMenu* menu = bridge_->menu_; BookmarkModel* model = bridge_->GetBookmarkModel(); @@ -285,7 +284,7 @@ TEST_F(BookmarkMenuBridgeTest, TestFavIconLoading) { EXPECT_TRUE(model && root); const BookmarkNode* node = - model->AddURL(root, 0, ASCIIToWide("Test Item"), + model->AddURL(root, 0, ASCIIToUTF16("Test Item"), GURL("http://favicon-test")); bridge_->UpdateMenu(menu); NSMenuItem* item = [menu itemWithTitle:@"Test Item"]; @@ -302,13 +301,13 @@ TEST_F(BookmarkMenuBridgeTest, TestChangeTitle) { EXPECT_TRUE(model && root); const BookmarkNode* node = - model->AddURL(root, 0, L"Test Item", + model->AddURL(root, 0, ASCIIToUTF16("Test Item"), GURL("http://title-test")); bridge_->UpdateMenu(menu); NSMenuItem* item = [menu itemWithTitle:@"Test Item"]; EXPECT_TRUE([item image]); - model->SetTitle(node, L"New Title"); + model->SetTitle(node, ASCIIToUTF16("New Title")); item = [menu itemWithTitle:@"Test Item"]; EXPECT_FALSE(item); diff --git a/chrome/browser/cocoa/bookmark_name_folder_controller.mm b/chrome/browser/cocoa/bookmark_name_folder_controller.mm index 108d87a..57b9116 100644 --- a/chrome/browser/cocoa/bookmark_name_folder_controller.mm +++ b/chrome/browser/cocoa/bookmark_name_folder_controller.mm @@ -1,4 +1,4 @@ -// 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. @@ -94,7 +94,7 @@ } else { model->AddGroup(parent_, newIndex_, - base::SysNSStringToWide(name)); + base::SysNSStringToUTF16(name)); } [NSApp endSheet:[self window]]; } diff --git a/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm index 56654a1..9419b8f 100644 --- a/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm @@ -1,10 +1,11 @@ -// 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. #import <Cocoa/Cocoa.h> #include "base/scoped_nsobject.h" +#include "base/utf_string_conversions.h" #import "chrome/browser/cocoa/bookmark_name_folder_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" @@ -45,7 +46,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNew) { [controller ok:nil]; EXPECT_EQ(1, parent->GetChildCount()); EXPECT_TRUE(parent->GetChild(0)->is_folder()); - EXPECT_EQ(L"Bozo", parent->GetChild(0)->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("Bozo"), parent->GetChild(0)->GetTitleAsString16()); } // Add new but specify a sibling. @@ -54,8 +55,10 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) { const BookmarkNode* parent = model->GetBookmarkBarNode(); // Add 2 nodes. We will place the new folder in the middle of these. - model->AddURL(parent, 0, L"title 1", GURL("http://www.google.com")); - model->AddURL(parent, 1, L"title 3", GURL("http://www.google.com")); + model->AddURL(parent, 0, ASCIIToUTF16("title 1"), + GURL("http://www.google.com")); + model->AddURL(parent, 1, ASCIIToUTF16("title 3"), + GURL("http://www.google.com")); EXPECT_EQ(2, parent->GetChildCount()); scoped_nsobject<BookmarkNameFolderController> @@ -73,7 +76,7 @@ TEST_F(BookmarkNameFolderControllerTest, AddNewWithSibling) { // Confirm we now have 3, and that the new one is in the middle. EXPECT_EQ(3, parent->GetChildCount()); EXPECT_TRUE(parent->GetChild(1)->is_folder()); - EXPECT_EQ(L"middle", parent->GetChild(1)->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("middle"), parent->GetChild(1)->GetTitleAsString16()); } // Make sure we are allowed to create a folder named "New Folder". @@ -123,7 +126,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) { const BookmarkNode* parent = model->GetBookmarkBarNode(); const BookmarkNode* folder = model->AddGroup(parent, parent->GetChildCount(), - L"group"); + ASCIIToUTF16("group")); // Rename the folder by creating a controller that originates from // the node. @@ -139,7 +142,7 @@ TEST_F(BookmarkNameFolderControllerTest, Rename) { [controller ok:nil]; EXPECT_EQ(1, parent->GetChildCount()); EXPECT_TRUE(parent->GetChild(0)->is_folder()); - EXPECT_EQ(L"Zobo", parent->GetChild(0)->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("Zobo"), parent->GetChild(0)->GetTitleAsString16()); } TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) { diff --git a/chrome/browser/extensions/extension_bookmarks_unittest.cc b/chrome/browser/extensions/extension_bookmarks_unittest.cc index e0dd270..2381c91 100644 --- a/chrome/browser/extensions/extension_bookmarks_unittest.cc +++ b/chrome/browser/extensions/extension_bookmarks_unittest.cc @@ -4,6 +4,7 @@ #include "testing/gtest/include/gtest/gtest.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/extensions/extension_bookmark_helpers.h" @@ -14,16 +15,16 @@ class ExtensionBookmarksTest : public testing::Test { public: virtual void SetUp() { model_.reset(new BookmarkModel(NULL)); - model_->AddURL(model_->other_node(), 0, L"Digg", + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("Digg"), GURL("http://www.reddit.com")); - model_->AddURL(model_->other_node(), 0, L"News", + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("News"), GURL("http://www.foxnews.com")); folder = - model_->AddGroup(model_->other_node(), 0, L"outer folder"); - model_->AddGroup(folder, 0, L"inner folder 1"); - model_->AddGroup(folder, 0, L"inner folder 2"); - model_->AddURL(folder, 0, L"Digg", GURL("http://reddit.com")); - model_->AddURL(folder, 0, L"CNet", GURL("http://cnet.com")); + model_->AddGroup(model_->other_node(), 0, ASCIIToUTF16("outer folder")); + model_->AddGroup(folder, 0, ASCIIToUTF16("inner folder 1")); + model_->AddGroup(folder, 0, ASCIIToUTF16("inner folder 2")); + model_->AddURL(folder, 0, ASCIIToUTF16("Digg"), GURL("http://reddit.com")); + model_->AddURL(folder, 0, ASCIIToUTF16("CNet"), GURL("http://cnet.com")); } scoped_ptr<BookmarkModel> model_; diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc index 478e9e9..8016644 100644 --- a/chrome/browser/gtk/bookmark_editor_gtk.cc +++ b/chrome/browser/gtk/bookmark_editor_gtk.cc @@ -312,7 +312,7 @@ void BookmarkEditorGtk::ApplyEdits(GtkTreeIter* selected_parent) { if (!show_tree_ || !selected_parent) { bookmark_utils::ApplyEditsWithNoGroupChange( - bb_model_, parent_, details_, UTF16ToWide(new_title), new_url); + bb_model_, parent_, details_, new_title, new_url); return; } @@ -328,7 +328,7 @@ void BookmarkEditorGtk::ApplyEdits(GtkTreeIter* selected_parent) { } bookmark_utils::ApplyEditsWithPossibleGroupChange( - bb_model_, new_parent, details_, UTF16ToWide(new_title), new_url); + bb_model_, new_parent, details_, new_title, new_url); } void BookmarkEditorGtk::AddNewGroup(GtkTreeIter* parent, GtkTreeIter* child) { diff --git a/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc b/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc index bd7969c..2e68517 100644 --- a/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc +++ b/chrome/browser/gtk/bookmark_editor_gtk_unittest.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2006-2008 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 <gtk/gtk.h> #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/gtk/bookmark_editor_gtk.h" @@ -75,21 +76,21 @@ class BookmarkEditorGtkTest : public testing::Test { void AddTestData() { std::string test_base = base_path(); - model_->AddURL(model_->GetBookmarkBarNode(), 0, L"a", + model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"), GURL(test_base + "a")); const BookmarkNode* f1 = - model_->AddGroup(model_->GetBookmarkBarNode(), 1, L"F1"); - model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a")); - const BookmarkNode* f11 = model_->AddGroup(f1, 1, L"F11"); - model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a")); - model_->AddGroup(model_->GetBookmarkBarNode(), 2, L"F2"); + model_->AddGroup(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1")); + model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a")); + const BookmarkNode* f11 = model_->AddGroup(f1, 1, ASCIIToUTF16("F11")); + model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a")); + model_->AddGroup(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2")); // Children of the other node. - model_->AddURL(model_->other_node(), 0, L"oa", + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("oa"), GURL(test_base + "oa")); const BookmarkNode* of1 = - model_->AddGroup(model_->other_node(), 1, L"OF1"); - model_->AddURL(of1, 0, L"of1a", GURL(test_base + "of1a")); + model_->AddGroup(model_->other_node(), 1, ASCIIToUTF16("OF1")); + model_->AddURL(of1, 0, ASCIIToUTF16("of1a"), GURL(test_base + "of1a")); } }; diff --git a/chrome/browser/gtk/bookmark_tree_model.cc b/chrome/browser/gtk/bookmark_tree_model.cc index 37e2767..9f18f54 100644 --- a/chrome/browser/gtk/bookmark_tree_model.cc +++ b/chrome/browser/gtk/bookmark_tree_model.cc @@ -1,4 +1,4 @@ -// 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. @@ -54,7 +54,7 @@ void RecursiveResolve(BookmarkModel* bb_model, const BookmarkNode* bb_node, const BookmarkNode* child_bb_node = NULL; if (id == 0) { child_bb_node = bb_model->AddGroup(bb_node, bb_node->GetChildCount(), - UTF16ToWide(title)); + title); } else { // Existing node, reset the title (BBModel ignores changes if the title // is the same). diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index 679f0ec..32f183d 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -106,7 +106,8 @@ void ProfileWriter::AddBookmarkEntry( } } if (child == NULL) - child = model->AddGroup(parent, parent->GetChildCount(), folder_name); + child = model->AddGroup(parent, parent->GetChildCount(), + WideToUTF16Hack(folder_name)); parent = child; } groups_added_to.insert(parent); diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index 1151ec1..7ebd8bf 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-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. @@ -7,7 +7,9 @@ #include <stack> #include <vector> +#include "base/string16.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/favicon_service.h" @@ -395,7 +397,7 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel( if (!foster_parent) { foster_parent = model->AddGroup(model->other_node(), model->other_node()->GetChildCount(), - std::wstring()); + string16()); } for (int i = dst->GetChildCount() - 1; i >= 0; --i) { model->Move(dst->GetChild(i), foster_parent, @@ -484,10 +486,12 @@ const BookmarkNode* BookmarkChangeProcessor::CreateBookmarkNode( const BookmarkNode* node; if (sync_node->GetIsFolder()) { - node = model->AddGroup(parent, index, sync_node->GetTitle()); + node = model->AddGroup(parent, index, + WideToUTF16Hack(sync_node->GetTitle())); } else { node = model->AddURL(parent, index, - sync_node->GetTitle(), sync_node->GetURL()); + WideToUTF16Hack(sync_node->GetTitle()), + sync_node->GetURL()); SetBookmarkFavicon(sync_node, node, model->profile()); } return node; diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 29fcaa4..4afd874 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -486,33 +486,35 @@ TEST_F(ProfileSyncServiceTest, BookmarkModelOperations) { // Test addition. const BookmarkNode* folder = - model_->AddGroup(model_->other_node(), 0, L"foobar"); + model_->AddGroup(model_->other_node(), 0, ASCIIToUTF16("foobar")); ExpectSyncerNodeMatching(folder); ExpectModelMatch(); - const BookmarkNode* folder2 = model_->AddGroup(folder, 0, L"nested"); + const BookmarkNode* folder2 = + model_->AddGroup(folder, 0, ASCIIToUTF16("nested")); ExpectSyncerNodeMatching(folder2); ExpectModelMatch(); const BookmarkNode* url1 = model_->AddURL( - folder, 0, L"Internets #1 Pies Site", GURL("http://www.easypie.com/")); + folder, 0, ASCIIToUTF16("Internets #1 Pies Site"), + GURL("http://www.easypie.com/")); ExpectSyncerNodeMatching(url1); ExpectModelMatch(); const BookmarkNode* url2 = model_->AddURL( - folder, 1, L"Airplanes", GURL("http://www.easyjet.com/")); + folder, 1, ASCIIToUTF16("Airplanes"), GURL("http://www.easyjet.com/")); ExpectSyncerNodeMatching(url2); ExpectModelMatch(); // Test modification. - model_->SetTitle(url2, L"EasyJet"); + model_->SetTitle(url2, ASCIIToUTF16("EasyJet")); ExpectModelMatch(); model_->Move(url1, folder2, 0); ExpectModelMatch(); model_->Move(folder2, model_->GetBookmarkBarNode(), 0); ExpectModelMatch(); - model_->SetTitle(folder2, L"Not Nested"); + model_->SetTitle(folder2, ASCIIToUTF16("Not Nested")); ExpectModelMatch(); model_->Move(folder, folder2, 0); ExpectModelMatch(); - model_->SetTitle(folder, L"who's nested now?"); + model_->SetTitle(folder, ASCIIToUTF16("who's nested now?")); ExpectModelMatch(); model_->Copy(url2, model_->GetBookmarkBarNode(), 0); ExpectModelMatch(); @@ -734,27 +736,27 @@ TEST_F(ProfileSyncServiceTest, CornerCaseNames) { LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE); StartSyncService(); - const wchar_t* names[] = { + const char* names[] = { // The empty string. - L"", + "", // Illegal Windows filenames. - L"CON", L"PRN", L"AUX", L"NUL", L"COM1", L"COM2", L"COM3", L"COM4", - L"COM5", L"COM6", L"COM7", L"COM8", L"COM9", L"LPT1", L"LPT2", L"LPT3", - L"LPT4", L"LPT5", L"LPT6", L"LPT7", L"LPT8", L"LPT9", + "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", + "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", + "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", // Current/parent directory markers. - L".", L"..", L"...", + ".", "..", "...", // Files created automatically by the Windows shell. - L"Thumbs.db", L".DS_Store", + "Thumbs.db", ".DS_Store", // Names including Win32-illegal characters, and path separators. - L"foo/bar", L"foo\\bar", L"foo?bar", L"foo:bar", L"foo|bar", L"foo\"bar", - L"foo'bar", L"foo<bar", L"foo>bar", L"foo%bar", L"foo*bar", L"foo]bar", - L"foo[bar", + "foo/bar", "foo\\bar", "foo?bar", "foo:bar", "foo|bar", "foo\"bar", + "foo'bar", "foo<bar", "foo>bar", "foo%bar", "foo*bar", "foo]bar", + "foo[bar", }; // Create both folders and bookmarks using each name. GURL url("http://www.doublemint.com"); for (size_t i = 0; i < arraysize(names); ++i) { - model_->AddGroup(model_->other_node(), 0, names[i]); - model_->AddURL(model_->other_node(), 0, names[i], url); + model_->AddGroup(model_->other_node(), 0, ASCIIToUTF16(names[i])); + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16(names[i]), url); } // Verify that the browser model matches the sync model. @@ -773,15 +775,15 @@ TEST_F(ProfileSyncServiceTest, RepeatedMiddleInsertion) { static const int kTimesToInsert = 256; // Create two book-end nodes to insert between. - model_->AddGroup(model_->other_node(), 0, L"Alpha"); - model_->AddGroup(model_->other_node(), 1, L"Omega"); + model_->AddGroup(model_->other_node(), 0, ASCIIToUTF16("Alpha")); + model_->AddGroup(model_->other_node(), 1, ASCIIToUTF16("Omega")); int count = 2; // Test insertion in first half of range by repeatedly inserting in second // position. for (int i = 0; i < kTimesToInsert; ++i) { string16 title = ASCIIToUTF16("Pre-insertion ") + base::IntToString16(i); - model_->AddGroup(model_->other_node(), 1, UTF16ToWideHack(title)); + model_->AddGroup(model_->other_node(), 1, title); count++; } @@ -789,7 +791,7 @@ TEST_F(ProfileSyncServiceTest, RepeatedMiddleInsertion) { // second-to-last position. for (int i = 0; i < kTimesToInsert; ++i) { string16 title = ASCIIToUTF16("Post-insertion ") + base::IntToString16(i); - model_->AddGroup(model_->other_node(), count - 1, UTF16ToWideHack(title)); + model_->AddGroup(model_->other_node(), count - 1, title); count++; } @@ -809,7 +811,7 @@ TEST_F(ProfileSyncServiceTest, UnrecoverableErrorSuspendsService) { // Add a node which will be the target of the consistency violation. const BookmarkNode* node = - model_->AddGroup(model_->other_node(), 0, L"node"); + model_->AddGroup(model_->other_node(), 0, ASCIIToUTF16("node")); ExpectSyncerNodeMatching(node); // Now destroy the syncer node as if we were the ProfileSyncService without @@ -829,13 +831,13 @@ TEST_F(ProfileSyncServiceTest, UnrecoverableErrorSuspendsService) { // Add a child to the inconsistent node. This should cause detection of the // problem and the syncer should stop processing changes. - model_->AddGroup(node, 0, L"nested"); + model_->AddGroup(node, 0, ASCIIToUTF16("nested")); EXPECT_FALSE(service_->ShouldPushChanges()); // Try to add a node under a totally different parent. This should also // fail -- the ProfileSyncService should stop processing changes after // encountering a consistency violation. - model_->AddGroup(model_->GetBookmarkBarNode(), 0, L"unrelated"); + model_->AddGroup(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("unrelated")); EXPECT_FALSE(service_->ShouldPushChanges()); // TODO(ncarter): We ought to test the ProfileSyncService state machine @@ -849,8 +851,10 @@ TEST_F(ProfileSyncServiceTest, MergeDuplicates) { LoadBookmarkModel(DELETE_EXISTING_STORAGE, SAVE_TO_STORAGE); StartSyncService(); - model_->AddURL(model_->other_node(), 0, L"Dup", GURL("http://dup.com/")); - model_->AddURL(model_->other_node(), 0, L"Dup", GURL("http://dup.com/")); + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("Dup"), + GURL("http://dup.com/")); + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("Dup"), + GURL("http://dup.com/")); EXPECT_EQ(2, model_->other_node()->GetChildCount()); @@ -976,9 +980,9 @@ void ProfileSyncServiceTestWithData::PopulateFromTestData( for (int i = 0; i < size; ++i) { const TestData& item = data[i]; if (item.url) { - model_->AddURL(node, i, item.title, GURL(item.url)); + model_->AddURL(node, i, WideToUTF16Hack(item.title), GURL(item.url)); } else { - model_->AddGroup(node, i, item.title); + model_->AddGroup(node, i, WideToUTF16Hack(item.title)); } } } diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index 454c194..5a7646b 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -4,6 +4,7 @@ #include "base/keyboard_codes.h" #include "base/string_number_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -215,31 +216,34 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { std::string test_base = "file:///c:/tmp/"; const BookmarkNode* f1 = model_->AddGroup( - model_->GetBookmarkBarNode(), 0, L"F1"); - model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a")); - const BookmarkNode* f11 = model_->AddGroup(f1, 1, L"F11"); - model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a")); + model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("F1")); + model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a")); + const BookmarkNode* f11 = model_->AddGroup(f1, 1, ASCIIToUTF16("F11")); + model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a")); if (big_menu) { for (int i = 1; i <= 100; ++i) { - model_->AddURL(f1, i + 1, L"f" + UTF8ToWide(base::IntToString(i)), + model_->AddURL(f1, i + 1, ASCIIToUTF16("f") + base::IntToString16(i), GURL(test_base + "f" + base::IntToString(i))); } } - model_->AddURL(model_->GetBookmarkBarNode(), 1, L"a", + model_->AddURL(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("a"), GURL(test_base + "a")); - model_->AddURL(model_->GetBookmarkBarNode(), 2, L"b", + model_->AddURL(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("b"), GURL(test_base + "b")); - model_->AddURL(model_->GetBookmarkBarNode(), 3, L"c", + model_->AddURL(model_->GetBookmarkBarNode(), 3, ASCIIToUTF16("c"), GURL(test_base + "c")); - model_->AddURL(model_->GetBookmarkBarNode(), 4, L"d", + model_->AddURL(model_->GetBookmarkBarNode(), 4, ASCIIToUTF16("d"), GURL(test_base + "d")); - model_->AddURL(model_->other_node(), 0, L"oa", GURL(test_base + "oa")); - const BookmarkNode* of = model_->AddGroup(model_->other_node(), 1, L"OF"); - model_->AddURL(of, 0, L"ofa", GURL(test_base + "ofa")); - model_->AddURL(of, 1, L"ofb", GURL(test_base + "ofb")); - const BookmarkNode* of2 = model_->AddGroup(model_->other_node(), 2, L"OF2"); - model_->AddURL(of2, 0, L"of2a", GURL(test_base + "of2a")); - model_->AddURL(of2, 1, L"of2b", GURL(test_base + "of2b")); + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("oa"), + GURL(test_base + "oa")); + const BookmarkNode* of = model_->AddGroup(model_->other_node(), 1, + ASCIIToUTF16("OF")); + model_->AddURL(of, 0, ASCIIToUTF16("ofa"), GURL(test_base + "ofa")); + model_->AddURL(of, 1, ASCIIToUTF16("ofb"), GURL(test_base + "ofb")); + const BookmarkNode* of2 = model_->AddGroup(model_->other_node(), 2, + ASCIIToUTF16("OF2")); + model_->AddURL(of2, 0, ASCIIToUTF16("of2a"), GURL(test_base + "of2a")); + model_->AddURL(of2, 1, ASCIIToUTF16("of2b"), GURL(test_base + "of2b")); } gfx::Size bb_view_pref_; diff --git a/chrome/browser/views/bookmark_context_menu_test.cc b/chrome/browser/views/bookmark_context_menu_test.cc index 97a2397..5e02753 100644 --- a/chrome/browser/views/bookmark_context_menu_test.cc +++ b/chrome/browser/views/bookmark_context_menu_test.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/scoped_ptr.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/chrome_thread.h" @@ -90,18 +91,18 @@ class BookmarkContextMenuTest : public testing::Test { void AddTestData() { std::string test_base = "file:///c:/tmp/"; - model_->AddURL(model_->GetBookmarkBarNode(), 0, L"a", + model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"), GURL(test_base + "a")); const BookmarkNode* f1 = - model_->AddGroup(model_->GetBookmarkBarNode(), 1, L"F1"); - model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a")); - const BookmarkNode* f11 = model_->AddGroup(f1, 1, L"F11"); - model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a")); - model_->AddGroup(model_->GetBookmarkBarNode(), 2, L"F2"); - model_->AddGroup(model_->GetBookmarkBarNode(), 3, L"F3"); + model_->AddGroup(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1")); + model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a")); + const BookmarkNode* f11 = model_->AddGroup(f1, 1, ASCIIToUTF16("F11")); + model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a")); + model_->AddGroup(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2")); + model_->AddGroup(model_->GetBookmarkBarNode(), 3, ASCIIToUTF16("F3")); const BookmarkNode* f4 = - model_->AddGroup(model_->GetBookmarkBarNode(), 4, L"F4"); - model_->AddURL(f4, 0, L"f4a", GURL(test_base + "f4a")); + model_->AddGroup(model_->GetBookmarkBarNode(), 4, ASCIIToUTF16("F4")); + model_->AddURL(f4, 0, ASCIIToUTF16("f4a"), GURL(test_base + "f4a")); } }; diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index 35de1aa..7428905 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -8,6 +8,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/history/history.h" @@ -528,7 +529,7 @@ void BookmarkEditorView::ApplyEdits(EditorNode* parent) { bb_model_->RemoveObserver(this); GURL new_url(GetInputURL()); - std::wstring new_title(GetInputTitle()); + string16 new_title(WideToUTF16Hack(GetInputTitle())); if (!show_tree_) { bookmark_utils::ApplyEditsWithNoGroupChange( @@ -558,7 +559,7 @@ void BookmarkEditorView::ApplyNameChangesAndCreateNewGroups( if (child_b_node->value == 0) { // New group. child_bb_node = bb_model_->AddGroup(bb_node, - bb_node->GetChildCount(), child_b_node->GetTitle()); + bb_node->GetChildCount(), child_b_node->GetTitleAsString16()); } else { // Existing node, reset the title (BBModel ignores changes if the title // is the same). @@ -570,7 +571,7 @@ void BookmarkEditorView::ApplyNameChangesAndCreateNewGroups( } } DCHECK(child_bb_node); - bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle()); + bb_model_->SetTitle(child_bb_node, child_b_node->GetTitleAsString16()); } ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node, parent_b_node, parent_bb_node); diff --git a/chrome/browser/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc index 15b30ad..6040c6e 100644 --- a/chrome/browser/views/bookmark_editor_view_unittest.cc +++ b/chrome/browser/views/bookmark_editor_view_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -104,21 +104,21 @@ class BookmarkEditorViewTest : public testing::Test { void AddTestData() { std::string test_base = base_path(); - model_->AddURL(model_->GetBookmarkBarNode(), 0, L"a", + model_->AddURL(model_->GetBookmarkBarNode(), 0, ASCIIToUTF16("a"), GURL(test_base + "a")); const BookmarkNode* f1 = - model_->AddGroup(model_->GetBookmarkBarNode(), 1, L"F1"); - model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a")); - const BookmarkNode* f11 = model_->AddGroup(f1, 1, L"F11"); - model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a")); - model_->AddGroup(model_->GetBookmarkBarNode(), 2, L"F2"); + model_->AddGroup(model_->GetBookmarkBarNode(), 1, ASCIIToUTF16("F1")); + model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a")); + const BookmarkNode* f11 = model_->AddGroup(f1, 1, ASCIIToUTF16("F11")); + model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a")); + model_->AddGroup(model_->GetBookmarkBarNode(), 2, ASCIIToUTF16("F2")); // Children of the other node. - model_->AddURL(model_->other_node(), 0, L"oa", + model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("oa"), GURL(test_base + "oa")); const BookmarkNode* of1 = - model_->AddGroup(model_->other_node(), 1, L"OF1"); - model_->AddURL(of1, 0, L"of1a", GURL(test_base + "of1a")); + model_->AddGroup(model_->other_node(), 1, ASCIIToUTF16("OF1")); + model_->AddURL(of1, 0, ASCIIToUTF16("of1a"), GURL(test_base + "of1a")); } scoped_ptr<BookmarkEditorView> editor_; @@ -138,17 +138,18 @@ TEST_F(BookmarkEditorViewTest, ModelsMatch) { BookmarkEditorView::EditorNode* bb_node = editor_root->GetChild(0); // The root should have 2 nodes: folder F1 and F2. ASSERT_EQ(2, bb_node->GetChildCount()); - ASSERT_EQ(L"F1", bb_node->GetChild(0)->GetTitle()); - ASSERT_EQ(L"F2", bb_node->GetChild(1)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("F1"), bb_node->GetChild(0)->GetTitleAsString16()); + ASSERT_EQ(ASCIIToUTF16("F2"), bb_node->GetChild(1)->GetTitleAsString16()); // F1 should have one child, F11 ASSERT_EQ(1, bb_node->GetChild(0)->GetChildCount()); - ASSERT_EQ(L"F11", bb_node->GetChild(0)->GetChild(0)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("F11"), + bb_node->GetChild(0)->GetChild(0)->GetTitleAsString16()); BookmarkEditorView::EditorNode* other_node = editor_root->GetChild(1); // Other node should have one child (OF1). ASSERT_EQ(1, other_node->GetChildCount()); - ASSERT_EQ(L"OF1", other_node->GetChild(0)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("OF1"), other_node->GetChild(0)->GetTitleAsString16()); } // Changes the title and makes sure parent/visual order doesn't change. @@ -161,7 +162,7 @@ TEST_F(BookmarkEditorViewTest, EditTitleKeepsPosition) { const BookmarkNode* bb_node = profile_->GetBookmarkModel()->GetBookmarkBarNode(); - ASSERT_EQ(L"new_a", bb_node->GetChild(0)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("new_a"), bb_node->GetChild(0)->GetTitleAsString16()); // The URL shouldn't have changed. ASSERT_TRUE(GURL(base_path() + "a") == bb_node->GetChild(0)->GetURL()); } @@ -179,7 +180,7 @@ TEST_F(BookmarkEditorViewTest, EditURLKeepsPosition) { const BookmarkNode* bb_node = profile_->GetBookmarkModel()->GetBookmarkBarNode(); - ASSERT_EQ(L"a", bb_node->GetChild(0)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("a"), bb_node->GetChild(0)->GetTitleAsString16()); // The URL should have changed. ASSERT_TRUE(GURL(base_path() + "new_a") == bb_node->GetChild(0)->GetURL()); ASSERT_TRUE(node_time == bb_node->GetChild(0)->date_added()); @@ -193,7 +194,7 @@ TEST_F(BookmarkEditorViewTest, ChangeParent) { ApplyEdits(editor_tree_model()->GetRoot()->GetChild(1)); const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node(); - ASSERT_EQ(L"a", other_node->GetChild(2)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("a"), other_node->GetChild(2)->GetTitleAsString16()); ASSERT_TRUE(GURL(base_path() + "a") == other_node->GetChild(2)->GetURL()); } @@ -209,7 +210,7 @@ TEST_F(BookmarkEditorViewTest, ChangeParentAndURL) { ApplyEdits(editor_tree_model()->GetRoot()->GetChild(1)); const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node(); - ASSERT_EQ(L"a", other_node->GetChild(2)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("a"), other_node->GetChild(2)->GetTitleAsString16()); ASSERT_TRUE(GURL(base_path() + "new_a") == other_node->GetChild(2)->GetURL()); ASSERT_TRUE(node_time == other_node->GetChild(2)->date_added()); } @@ -223,9 +224,9 @@ TEST_F(BookmarkEditorViewTest, MoveToNewParent) { BookmarkEditorView::EditorNode* f2 = editor_tree_model()->GetRoot()->GetChild(0)->GetChild(1); BookmarkEditorView::EditorNode* f21 = AddNewGroup(f2); - f21->SetTitle(L"F21"); + f21->SetTitle(ASCIIToUTF16("F21")); BookmarkEditorView::EditorNode* f211 = AddNewGroup(f21); - f211->SetTitle(L"F211"); + f211->SetTitle(ASCIIToUTF16("F211")); // Parent the node to "F21". ApplyEdits(f2); @@ -237,14 +238,14 @@ TEST_F(BookmarkEditorViewTest, MoveToNewParent) { // F2 in the model should have two children now: F21 and the node edited. ASSERT_EQ(2, mf2->GetChildCount()); // F21 should be first. - ASSERT_EQ(L"F21", mf2->GetChild(0)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("F21"), mf2->GetChild(0)->GetTitleAsString16()); // Then a. - ASSERT_EQ(L"a", mf2->GetChild(1)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("a"), mf2->GetChild(1)->GetTitleAsString16()); // F21 should have one child, F211. const BookmarkNode* mf21 = mf2->GetChild(0); ASSERT_EQ(1, mf21->GetChildCount()); - ASSERT_EQ(L"F211", mf21->GetChild(0)->GetTitle()); + ASSERT_EQ(ASCIIToUTF16("F211"), mf21->GetChild(0)->GetTitleAsString16()); } // Brings up the editor, creating a new URL on the bookmark bar. @@ -263,7 +264,7 @@ TEST_F(BookmarkEditorViewTest, NewURL) { const BookmarkNode* new_node = bb_node->GetChild(3); - EXPECT_EQ(L"new_a", new_node->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitleAsString16()); EXPECT_TRUE(GURL(base_path() + "a") == new_node->GetURL()); } @@ -283,7 +284,7 @@ TEST_F(BookmarkEditorViewTest, ChangeURLNoTree) { const BookmarkNode* new_node = other_node->GetChild(0); - EXPECT_EQ(L"new_a", new_node->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitleAsString16()); EXPECT_TRUE(GURL(base_path() + "a") == new_node->GetURL()); } @@ -302,7 +303,7 @@ TEST_F(BookmarkEditorViewTest, ChangeTitleNoTree) { const BookmarkNode* new_node = other_node->GetChild(0); - EXPECT_EQ(L"new_a", new_node->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitleAsString16()); } // Creates a new folder. @@ -324,7 +325,7 @@ TEST_F(BookmarkEditorViewTest, NewFolder) { const BookmarkNode* new_node = model_->GetBookmarkBarNode()->GetChild(3); EXPECT_EQ(BookmarkNode::FOLDER, new_node->type()); - EXPECT_EQ(L"new_F", new_node->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitleAsString16()); // The node should have one child. ASSERT_EQ(1, new_node->GetChildCount()); const BookmarkNode* new_child = new_node->GetChild(0); @@ -352,7 +353,7 @@ TEST_F(BookmarkEditorViewTest, MoveFolder) { ASSERT_EQ(3, model_->other_node()->GetChildCount()); const BookmarkNode* new_node = model_->other_node()->GetChild(2); EXPECT_EQ(BookmarkNode::FOLDER, new_node->type()); - EXPECT_EQ(L"new_F", new_node->GetTitle()); + EXPECT_EQ(ASCIIToUTF16("new_F"), new_node->GetTitleAsString16()); // The node should have one child. ASSERT_EQ(1, new_node->GetChildCount()); const BookmarkNode* new_child = new_node->GetChild(0); diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc index ba2904a..47eda8ad 100644 --- a/chrome/test/live_sync/bookmark_model_verifier.cc +++ b/chrome/test/live_sync/bookmark_model_verifier.cc @@ -131,11 +131,13 @@ const BookmarkNode* BookmarkModelVerifier::AddGroup(BookmarkModel* model, const BookmarkNode* parent, int index, const wstring& title) { const BookmarkNode* v_parent = NULL; FindNodeInVerifier(model, parent, &v_parent); - const BookmarkNode* result = model->AddGroup(parent, index, title); + const BookmarkNode* result = model->AddGroup(parent, index, + WideToUTF16Hack(title)); EXPECT_TRUE(result); if (!result) return NULL; - const BookmarkNode* v_node = model_->AddGroup(v_parent, index, title); + const BookmarkNode* v_node = model_->AddGroup(v_parent, index, + WideToUTF16Hack(title)); EXPECT_TRUE(v_node); if (!v_node) return NULL; @@ -246,8 +248,9 @@ const BookmarkNode* BookmarkModelVerifier::SetURL(BookmarkModel* model, FindNodeInVerifier(model, node, &v_node); const BookmarkNode* result = bookmark_utils::ApplyEditsWithNoGroupChange( model, node->GetParent(), BookmarkEditor::EditDetails(node), - node->GetTitle(), new_url); + node->GetTitleAsString16(), new_url); bookmark_utils::ApplyEditsWithNoGroupChange(model_, v_node->GetParent(), - BookmarkEditor::EditDetails(v_node), v_node->GetTitle(), new_url); + BookmarkEditor::EditDetails(v_node), v_node->GetTitleAsString16(), + new_url); return result; } 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 35f2053..96941f4 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 @@ -3,7 +3,9 @@ // found in the LICENSE file. #include "base/rand_util.h" +#include "base/string16.h" #include "base/string_number_conversions.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/test/live_sync/live_bookmarks_sync_test.h" @@ -122,10 +124,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, GURL initial_url("http://www.google.com"); GURL second_url("http://www.google.com/abc"); GURL third_url("http://www.google.com/def"); - wstring title = L"Google"; + string16 title = ASCIIToUTF16("Google"); { - const BookmarkNode* google = v->AddURL(bm0, bm_bar0, 0, - title, initial_url); + const BookmarkNode* google = + v->AddURL(bm0, bm_bar0, 0, UTF16ToWideHack(title), initial_url); ASSERT_TRUE(google != NULL); } ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); diff --git a/chrome/test/model_test_utils.cc b/chrome/test/model_test_utils.cc index 218cfd8..d55a571 100644 --- a/chrome/test/model_test_utils.cc +++ b/chrome/test/model_test_utils.cc @@ -4,6 +4,7 @@ #include "model_test_utils.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "googleurl/src/gurl.h" @@ -47,7 +48,8 @@ std::wstring::size_type AddNodesFromString(BookmarkModel& model, tell = node_name.substr(part_length - 2, 2); if (tell == folder_tell) { node_name = node_name.substr(0, part_length - 2); - const BookmarkNode* new_node = model.AddGroup(node, index, node_name); + const BookmarkNode* new_node = + model.AddGroup(node, index, WideToUTF16Hack(node_name)); end_pos = AddNodesFromString(model, new_node, model_string, end_pos + 1); } else { |