diff options
4 files changed, 50 insertions, 43 deletions
diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc index 6f681fb..905b55a 100644 --- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc @@ -202,9 +202,9 @@ TEST_F(BookmarkCodecTest, ChecksumManualEditTest) { // Change something in the encoded value before decoding it. DictionaryValue* child1_value; GetBookmarksBarChildValue(value.get(), 0, &child1_value); - std::wstring title; + std::string title; ASSERT_TRUE(child1_value->GetString(BookmarkCodec::kNameKey, &title)); - child1_value->SetString(BookmarkCodec::kNameKey, title + L"1"); + child1_value->SetString(BookmarkCodec::kNameKey, title + "1"); std::string dec_checksum; scoped_ptr<BookmarkModel> decoded_model1(DecodeHelper( diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc index 0e2c2b7..434a537 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc @@ -6,6 +6,7 @@ #include "app/os_exchange_data_provider_win.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" +#include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -63,8 +64,8 @@ TEST_F(BookmarkDragDataTest, JustURL) { EXPECT_TRUE(drag_data.is_valid()); ASSERT_EQ(1, drag_data.elements.size()); EXPECT_TRUE(drag_data.elements[0].is_url); - EXPECT_TRUE(drag_data.elements[0].url == url); - EXPECT_TRUE(drag_data.elements[0].title == title); + EXPECT_EQ(url, drag_data.elements[0].url); + EXPECT_EQ(title, drag_data.elements[0].title); EXPECT_EQ(0, drag_data.elements[0].children.size()); } @@ -77,14 +78,14 @@ TEST_F(BookmarkDragDataTest, URL) { BookmarkModel* model = profile.GetBookmarkModel(); const BookmarkNode* root = model->GetBookmarkBarNode(); GURL url(GURL("http://foo.com")); - const std::wstring title(L"blah"); + const string16 title(ASCIIToUTF16("blah")); const BookmarkNode* node = model->AddURL(root, 0, title, url); BookmarkDragData drag_data(node); EXPECT_TRUE(drag_data.is_valid()); ASSERT_EQ(1, drag_data.elements.size()); EXPECT_TRUE(drag_data.elements[0].is_url); - EXPECT_TRUE(drag_data.elements[0].url == url); - EXPECT_EQ(title, drag_data.elements[0].title); + EXPECT_EQ(url, drag_data.elements[0].url); + EXPECT_EQ(title, WideToUTF16Hack(drag_data.elements[0].title)); OSExchangeData data; drag_data.Write(&profile, &data); @@ -95,7 +96,7 @@ TEST_F(BookmarkDragDataTest, URL) { EXPECT_TRUE(read_data.is_valid()); ASSERT_EQ(1, read_data.elements.size()); EXPECT_TRUE(read_data.elements[0].is_url); - EXPECT_TRUE(read_data.elements[0].url == url); + EXPECT_EQ(url, read_data.elements[0].url); EXPECT_EQ(title, read_data.elements[0].title); EXPECT_TRUE(read_data.GetFirstNode(&profile) == node); @@ -107,7 +108,7 @@ TEST_F(BookmarkDragDataTest, URL) { GURL read_url; std::wstring read_title; EXPECT_TRUE(data2.GetURLAndTitle(&read_url, &read_title)); - EXPECT_TRUE(read_url == url); + EXPECT_EQ(url, read_url); EXPECT_EQ(title, read_title); } @@ -161,7 +162,7 @@ TEST_F(BookmarkDragDataTest, GroupWithChild) { const BookmarkNode* group = model->AddGroup(root, 0, ASCIIToUTF16("g1")); GURL url(GURL("http://foo.com")); - const std::wstring title(L"blah2"); + const string16 title(ASCIIToUTF16("blah2")); model->AddURL(group, 0, title, url); @@ -180,8 +181,8 @@ TEST_F(BookmarkDragDataTest, GroupWithChild) { read_data.elements[0].children[0]; EXPECT_TRUE(read_child.is_url); - EXPECT_EQ(title, read_child.title); - EXPECT_TRUE(url == read_child.url); + EXPECT_EQ(title, WideToUTF16Hack(read_child.title)); + EXPECT_EQ(url, read_child.url); EXPECT_TRUE(read_child.is_url); // And make sure we get the node back. @@ -200,7 +201,7 @@ TEST_F(BookmarkDragDataTest, MultipleNodes) { const BookmarkNode* group = model->AddGroup(root, 0, ASCIIToUTF16("g1")); GURL url(GURL("http://foo.com")); - const std::wstring title(L"blah2"); + const string16 title(ASCIIToUTF16("blah2")); const BookmarkNode* url_node = model->AddURL(group, 0, title, url); @@ -227,7 +228,7 @@ TEST_F(BookmarkDragDataTest, MultipleNodes) { const BookmarkDragData::Element& read_url = read_data.elements[1]; EXPECT_TRUE(read_url.is_url); - EXPECT_EQ(title, read_url.title); + EXPECT_EQ(title, WideToUTF16Hack(read_url.title)); EXPECT_EQ(0, read_url.children.size()); // And make sure we get the node back. diff --git a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc index 1844fd8..22a7352 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/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profile.h" @@ -40,16 +41,20 @@ BookmarkFolderEditorController::BookmarkFolderEditorController( details_(details) { DCHECK(IsNew() || node); - std::wstring title = IsNew() ? - l10n_util::GetString(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : - l10n_util::GetString(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE); - std::wstring label = - l10n_util::GetString(IDS_BOOMARK_BAR_EDIT_FOLDER_LABEL); - std::wstring contents = IsNew() ? - l10n_util::GetString(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME) : - UTF16ToWide(node_->GetTitle()); + string16 title = IsNew() ? + l10n_util::GetStringUTF16(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : + l10n_util::GetStringUTF16(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE); + string16 label = + l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_EDIT_FOLDER_LABEL); + string16 contents = IsNew() ? + l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME) : + node_->GetTitle(); - dialog_ = InputWindowDialog::Create(wnd, title, label, contents, this); + dialog_ = InputWindowDialog::Create(wnd, + UTF16ToWideHack(title), + UTF16ToWideHack(label), + UTF16ToWideHack(contents), + this); model_->AddObserver(this); } diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 90ad16b..4a365e8 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -53,40 +53,41 @@ class BookmarkHTMLWriterTest : public testing::Test { } // Converts a BookmarkEntry to a string suitable for assertion testing. - std::wstring BookmarkEntryToString( + string16 BookmarkEntryToString( const ProfileWriter::BookmarkEntry& entry) { - std::wstring result; - result.append(L"on_toolbar="); + string16 result; + result.append(ASCIIToUTF16("on_toolbar=")); if (entry.in_toolbar) - result.append(L"false"); + result.append(ASCIIToUTF16("false")); else - result.append(L"true"); + result.append(ASCIIToUTF16("true")); - result.append(L" url=" + UTF8ToWide(entry.url.spec())); + result.append(ASCIIToUTF16(" url=") + UTF8ToUTF16(entry.url.spec())); - result.append(L" path="); + result.append(ASCIIToUTF16(" path=")); for (size_t i = 0; i < entry.path.size(); ++i) { if (i != 0) - result.append(L"/"); - result.append(entry.path[i]); + result.append(ASCIIToUTF16("/")); + result.append(WideToUTF16Hack(entry.path[i])); } - result.append(L" title="); - result.append(entry.title); + result.append(ASCIIToUTF16(" title=")); + result.append(WideToUTF16Hack(entry.title)); - result.append(L" time="); - result.append(base::TimeFormatFriendlyDateAndTime(entry.creation_time)); + result.append(ASCIIToUTF16(" time=")); + result.append(WideToUTF16Hack( + base::TimeFormatFriendlyDateAndTime(entry.creation_time))); return result; } // Creates a set of bookmark values to a string for assertion testing. - std::wstring BookmarkValuesToString(bool on_toolbar, - const GURL& url, - const string16& title, - base::Time creation_time, - const string16& f1, - const string16& f2, - const string16& f3) { + string16 BookmarkValuesToString(bool on_toolbar, + const GURL& url, + const string16& title, + base::Time creation_time, + const string16& f1, + const string16& f2, + const string16& f3) { ProfileWriter::BookmarkEntry entry; entry.in_toolbar = on_toolbar; entry.url = url; |