diff options
Diffstat (limited to 'chrome/browser/ui')
4 files changed, 14 insertions, 10 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm index fd09f81..e2b50d3 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm @@ -6,6 +6,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_nsobject.h" +#include "base/string16.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -192,7 +193,7 @@ TEST_F(BookmarkBubbleControllerTest, TestFolderWithBlankName) { ASCIIToUTF16("one")); EXPECT_TRUE(node1); const BookmarkNode* node2 = model->AddFolder(bookmarkBarNode, 1, - ASCIIToUTF16("")); + string16()); EXPECT_TRUE(node2); const BookmarkNode* node3 = model->AddFolder(bookmarkBarNode, 2, ASCIIToUTF16("three")); diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 019a565..7ad8190 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" +#include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" @@ -957,7 +958,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateInNewTab) { // in the first tab. EXPECT_EQ(ASCIIToUTF16("page"), GetFindBarText()); // But it should not seem like a search has been issued. - EXPECT_EQ(ASCIIToUTF16(""), GetMatchCountText()); + EXPECT_EQ(string16(), GetMatchCountText()); } // This makes sure that we can search for A in tabA, then for B in tabB and diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index 31a9f3a..009c7a8 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "base/path_service.h" +#include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history.h" @@ -345,7 +346,7 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) { // Check to see if the chapter stops have the right labels. int index = BackForwardMenuModel::kMaxHistoryItems; // Empty string indicates item is a separator. - EXPECT_EQ(ASCIIToUTF16(""), back_model->GetLabelAt(index++)); + EXPECT_EQ(string16(), back_model->GetLabelAt(index++)); EXPECT_EQ(ASCIIToUTF16("F3"), back_model->GetLabelAt(index++)); EXPECT_EQ(ASCIIToUTF16("E3"), back_model->GetLabelAt(index++)); EXPECT_EQ(ASCIIToUTF16("D3"), back_model->GetLabelAt(index++)); @@ -353,7 +354,7 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) { // The menu should only show a maximum of 5 chapter stops. EXPECT_EQ(ASCIIToUTF16("B3"), back_model->GetLabelAt(index)); // Empty string indicates item is a separator. - EXPECT_EQ(ASCIIToUTF16(""), back_model->GetLabelAt(index + 1)); + EXPECT_EQ(string16(), back_model->GetLabelAt(index + 1)); EXPECT_EQ(back_model->GetShowFullHistoryLabel(), back_model->GetLabelAt(index + 2)); @@ -371,7 +372,7 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) { EXPECT_EQ(ASCIIToUTF16("A3"), back_model->GetLabelAt(index)); GoBack(); // It is now a separator. - EXPECT_EQ(ASCIIToUTF16(""), back_model->GetLabelAt(index)); + EXPECT_EQ(string16(), back_model->GetLabelAt(index)); // Undo our position change. NavigateToOffset(6); @@ -394,7 +395,7 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) { // Check to see if the chapter stops have the right labels. index = BackForwardMenuModel::kMaxHistoryItems; // Empty string indicates item is a separator. - EXPECT_EQ(ASCIIToUTF16(""), forward_model->GetLabelAt(index++)); + EXPECT_EQ(string16(), forward_model->GetLabelAt(index++)); EXPECT_EQ(ASCIIToUTF16("E3"), forward_model->GetLabelAt(index++)); EXPECT_EQ(ASCIIToUTF16("F3"), forward_model->GetLabelAt(index++)); EXPECT_EQ(ASCIIToUTF16("G3"), forward_model->GetLabelAt(index++)); @@ -402,7 +403,7 @@ TEST_F(BackFwdMenuModelTest, ChapterStops) { // The menu should only show a maximum of 5 chapter stops. EXPECT_EQ(ASCIIToUTF16("I3"), forward_model->GetLabelAt(index)); // Empty string indicates item is a separator. - EXPECT_EQ(ASCIIToUTF16(""), forward_model->GetLabelAt(index + 1)); + EXPECT_EQ(string16(), forward_model->GetLabelAt(index + 1)); EXPECT_EQ(forward_model->GetShowFullHistoryLabel(), forward_model->GetLabelAt(index + 2)); diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 4f9b238..1bf0cd3 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -12,6 +12,7 @@ #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" #include "base/memory/weak_ptr.h" +#include "base/string16.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" @@ -276,7 +277,7 @@ void FlashDOMHandler::MaybeRespondToPage() { } // Crash information. - AddPair(list, ASCIIToUTF16(""), "--- Crash data ---"); + AddPair(list, string16(), "--- Crash data ---"); bool crash_reporting_enabled = CrashesUI::CrashReportingEnabled(); if (crash_reporting_enabled) { std::vector<CrashUploadList::CrashInfo> crashes; @@ -297,7 +298,7 @@ void FlashDOMHandler::MaybeRespondToPage() { } // GPU information. - AddPair(list, ASCIIToUTF16(""), "--- GPU information ---"); + AddPair(list, string16(), "--- GPU information ---"); const content::GPUInfo& gpu_info = gpu_data_manager_->gpu_info(); if (!gpu_data_manager_->GpuAccessAllowed()) @@ -325,7 +326,7 @@ void FlashDOMHandler::MaybeRespondToPage() { } #endif - AddPair(list, ASCIIToUTF16(""), "--- GPU driver, more information ---"); + AddPair(list, string16(), "--- GPU driver, more information ---"); AddPair(list, ASCIIToUTF16("Vendor Id"), base::StringPrintf("0x%04x", gpu_info.vendor_id)); |