diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 17:58:58 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 17:58:58 +0000 |
| commit | 670d3239b119ec0dd29271b3851aa96ec4d2072b (patch) | |
| tree | 044c8c9729e3ecd4d9e8fa97b7aeb054d6e6f62b | |
| parent | 81704388221bd8f081565e963c4d3ac34f05d587 (diff) | |
| download | chromium_src-670d3239b119ec0dd29271b3851aa96ec4d2072b.zip chromium_src-670d3239b119ec0dd29271b3851aa96ec4d2072b.tar.gz chromium_src-670d3239b119ec0dd29271b3851aa96ec4d2072b.tar.bz2 | |
Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/109013006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242447 0039d316-1c4b-4281-b951-d872f2087c98
44 files changed, 293 insertions, 240 deletions
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc index 42698de..0cb9fa7 100644 --- a/chrome/browser/about_flags_unittest.cc +++ b/chrome/browser/about_flags_unittest.cc @@ -344,7 +344,7 @@ TEST_F(AboutFlagsTest, CheckValues) { #if defined(OS_WIN) EXPECT_EQ(std::wstring::npos, command_line.GetCommandLineString().find( - ASCIIToWide(switch1_with_equals))); + base::ASCIIToWide(switch1_with_equals))); #else EXPECT_EQ(std::string::npos, command_line.GetCommandLineString().find(switch1_with_equals)); @@ -357,7 +357,7 @@ TEST_F(AboutFlagsTest, CheckValues) { #if defined(OS_WIN) EXPECT_NE(std::wstring::npos, command_line.GetCommandLineString().find( - ASCIIToWide(switch2_with_equals))); + base::ASCIIToWide(switch2_with_equals))); #else EXPECT_NE(std::string::npos, command_line.GetCommandLineString().find(switch2_with_equals)); diff --git a/chrome/browser/accessibility/accessibility_extension_apitest.cc b/chrome/browser/accessibility/accessibility_extension_apitest.cc index 279e6d9..00a1013 100644 --- a/chrome/browser/accessibility/accessibility_extension_apitest.cc +++ b/chrome/browser/accessibility/accessibility_extension_apitest.cc @@ -35,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetAlertsForTab) { const char kAlertMessage[] = "Simple Alert Infobar."; SimpleAlertInfoBarDelegate::Create(infobar_service, InfoBarDelegate::kNoIconID, - ASCIIToUTF16(kAlertMessage), false); + base::ASCIIToUTF16(kAlertMessage), false); CommandLine::ForCurrentProcess()->AppendSwitch( extensions::switches::kEnableExperimentalExtensionApis); ASSERT_TRUE(RunExtensionTest("accessibility/get_alerts_for_tab")) << message_; diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc index e40c0d4..dbbf1ce 100644 --- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc +++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc @@ -149,7 +149,7 @@ TEST_F(PartnerBookmarksShimTest, RemoveBookmarks) { EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0); BookmarkNode* root_partner_node = new BookmarkPermanentNode(0); - root_partner_node->SetTitle(ASCIIToUTF16("Partner bookmarks")); + root_partner_node->SetTitle(base::ASCIIToUTF16("Partner bookmarks")); BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://www.a.net")); partner_folder1->set_type(BookmarkNode::FOLDER); @@ -238,28 +238,28 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) { EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0); BookmarkNode* root_partner_node = new BookmarkPermanentNode(0); - root_partner_node->SetTitle(ASCIIToUTF16("Partner bookmarks")); + root_partner_node->SetTitle(base::ASCIIToUTF16("Partner bookmarks")); BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://www.a.net")); partner_folder1->set_type(BookmarkNode::FOLDER); - partner_folder1->SetTitle(ASCIIToUTF16("a.net")); + partner_folder1->SetTitle(base::ASCIIToUTF16("a.net")); root_partner_node->Add(partner_folder1, root_partner_node->child_count()); BookmarkNode* partner_folder2 = new BookmarkNode(2, GURL("http://www.b.net")); partner_folder2->set_type(BookmarkNode::FOLDER); - partner_folder2->SetTitle(ASCIIToUTF16("b.net")); + partner_folder2->SetTitle(base::ASCIIToUTF16("b.net")); root_partner_node->Add(partner_folder2, root_partner_node->child_count()); BookmarkNode* partner_bookmark1 = new BookmarkNode(3, GURL("http://www.a.com")); partner_bookmark1->set_type(BookmarkNode::URL); - partner_bookmark1->SetTitle(ASCIIToUTF16("a.com")); + partner_bookmark1->SetTitle(base::ASCIIToUTF16("a.com")); partner_folder1->Add(partner_bookmark1, partner_folder1->child_count()); BookmarkNode* partner_bookmark2 = new BookmarkNode(4, GURL("http://www.b.com")); partner_bookmark2->set_type(BookmarkNode::URL); - partner_bookmark2->SetTitle(ASCIIToUTF16("b.com")); + partner_bookmark2->SetTitle(base::ASCIIToUTF16("b.com")); partner_folder2->Add(partner_bookmark2, partner_folder2->child_count()); ASSERT_FALSE(shim->IsLoaded()); @@ -280,9 +280,9 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) { EXPECT_TRUE(shim->IsReachable(partner_bookmark2)); EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(1); - EXPECT_EQ(ASCIIToUTF16("b.com"), shim->GetTitle(partner_bookmark2)); - shim->RenameBookmark(partner_bookmark2, ASCIIToUTF16("b2.com")); - EXPECT_EQ(ASCIIToUTF16("b2.com"), shim->GetTitle(partner_bookmark2)); + EXPECT_EQ(base::ASCIIToUTF16("b.com"), shim->GetTitle(partner_bookmark2)); + shim->RenameBookmark(partner_bookmark2, base::ASCIIToUTF16("b2.com")); + EXPECT_EQ(base::ASCIIToUTF16("b2.com"), shim->GetTitle(partner_bookmark2)); EXPECT_TRUE(shim->IsReachable(root_partner_node)); EXPECT_TRUE(shim->IsReachable(partner_folder1)); @@ -291,9 +291,9 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) { EXPECT_TRUE(shim->IsReachable(partner_bookmark2)); EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(1); - EXPECT_EQ(ASCIIToUTF16("a.net"), shim->GetTitle(partner_folder1)); - shim->RenameBookmark(partner_folder1, ASCIIToUTF16("a2.net")); - EXPECT_EQ(ASCIIToUTF16("a2.net"), shim->GetTitle(partner_folder1)); + EXPECT_EQ(base::ASCIIToUTF16("a.net"), shim->GetTitle(partner_folder1)); + shim->RenameBookmark(partner_folder1, base::ASCIIToUTF16("a2.net")); + EXPECT_EQ(base::ASCIIToUTF16("a2.net"), shim->GetTitle(partner_folder1)); EXPECT_TRUE(shim->IsReachable(root_partner_node)); EXPECT_TRUE(shim->IsReachable(partner_folder1)); @@ -302,10 +302,10 @@ TEST_F(PartnerBookmarksShimTest, RenameBookmarks) { EXPECT_TRUE(shim->IsReachable(partner_bookmark2)); EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(1); - EXPECT_EQ(ASCIIToUTF16("Partner bookmarks"), + EXPECT_EQ(base::ASCIIToUTF16("Partner bookmarks"), shim->GetTitle(root_partner_node)); - shim->RenameBookmark(root_partner_node, ASCIIToUTF16("Partner")); - EXPECT_EQ(ASCIIToUTF16("Partner"), shim->GetTitle(root_partner_node)); + shim->RenameBookmark(root_partner_node, base::ASCIIToUTF16("Partner")); + EXPECT_EQ(base::ASCIIToUTF16("Partner"), shim->GetTitle(root_partner_node)); EXPECT_TRUE(shim->IsReachable(root_partner_node)); EXPECT_TRUE(shim->IsReachable(partner_folder1)); @@ -323,23 +323,23 @@ TEST_F(PartnerBookmarksShimTest, SaveLoadProfile) { EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0); BookmarkNode* root_partner_node = new BookmarkPermanentNode(0); - root_partner_node->SetTitle(ASCIIToUTF16("Partner bookmarks")); + root_partner_node->SetTitle(base::ASCIIToUTF16("Partner bookmarks")); BookmarkNode* partner_folder1 = new BookmarkNode(1, GURL("http://a.net")); partner_folder1->set_type(BookmarkNode::FOLDER); - partner_folder1->SetTitle(ASCIIToUTF16("a.net")); + partner_folder1->SetTitle(base::ASCIIToUTF16("a.net")); root_partner_node->Add(partner_folder1, root_partner_node->child_count()); BookmarkNode* partner_bookmark1 = new BookmarkNode(3, GURL("http://a.com")); partner_bookmark1->set_type(BookmarkNode::URL); - partner_bookmark1->SetTitle(ASCIIToUTF16("a.com")); + partner_bookmark1->SetTitle(base::ASCIIToUTF16("a.com")); partner_folder1->Add(partner_bookmark1, partner_folder1->child_count()); BookmarkNode* partner_bookmark2 = new BookmarkNode(5, GURL("http://b.com")); partner_bookmark2->set_type(BookmarkNode::URL); - partner_bookmark2->SetTitle(ASCIIToUTF16("b.com")); + partner_bookmark2->SetTitle(base::ASCIIToUTF16("b.com")); partner_folder1->Add(partner_bookmark2, partner_folder1->child_count()); ASSERT_FALSE(shim->IsLoaded()); @@ -348,9 +348,9 @@ TEST_F(PartnerBookmarksShimTest, SaveLoadProfile) { ASSERT_TRUE(shim->IsLoaded()); EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(2); - shim->RenameBookmark(partner_bookmark1, ASCIIToUTF16("a2.com")); + shim->RenameBookmark(partner_bookmark1, base::ASCIIToUTF16("a2.com")); shim->RemoveBookmark(partner_bookmark2); - EXPECT_EQ(ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); + EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); EXPECT_FALSE(shim->IsReachable(partner_bookmark2)); } @@ -367,7 +367,7 @@ TEST_F(PartnerBookmarksShimTest, SaveLoadProfile) { const BookmarkNode* partner_bookmark1 = shim->GetNodeByID(3); const BookmarkNode* partner_bookmark2 = shim->GetNodeByID(5); - EXPECT_EQ(ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); + EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); EXPECT_FALSE(shim->IsReachable(partner_bookmark2)); } } diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc index eeda18a..4f2c32e 100644 --- a/chrome/browser/android/dev_tools_server.cc +++ b/chrome/browser/android/dev_tools_server.cc @@ -83,14 +83,14 @@ class TargetBase : public content::DevToolsTarget { protected: explicit TargetBase(WebContents* web_contents) - : title_(UTF16ToUTF8(web_contents->GetTitle())), + : title_(base::UTF16ToUTF8(web_contents->GetTitle())), url_(web_contents->GetURL()), favicon_url_(GetFaviconURL(web_contents)), last_activity_time_(web_contents->GetLastSelectedTime()) { } TargetBase(const base::string16& title, const GURL& url) - : title_(UTF16ToUTF8(title)), + : title_(base::UTF16ToUTF8(title)), url_(url) {} diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index cd0c28f..794a868 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -169,7 +169,7 @@ GURL ParseAndMaybeAppendScheme(const base::string16& url, const char* default_scheme) { GURL gurl(url); if (!gurl.is_valid() && !gurl.has_scheme()) { - base::string16 refined_url(ASCIIToUTF16(default_scheme)); + base::string16 refined_url(base::ASCIIToUTF16(default_scheme)); refined_url.append(url); gurl = GURL(refined_url); } @@ -1095,7 +1095,7 @@ void FillBookmarkRow(JNIEnv* env, // history::BookmarkRow.raw_url_. GURL gurl = ParseAndMaybeAppendScheme(raw_url, kDefaultUrlScheme); row->set_url(gurl); - row->set_raw_url(UTF16ToUTF8(raw_url)); + row->set_raw_url(base::UTF16ToUTF8(raw_url)); } if (created) diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index bef2bfa..79b2d89 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -1427,7 +1427,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver { ++cursor, ++position) { DCHECK_EQ(applications.GetPosition(cursor->get()), position); NSString* itemStr = - base::SysUTF16ToNSString(UTF8ToUTF16((*cursor)->name())); + base::SysUTF16ToNSString(base::UTF8ToUTF16((*cursor)->name())); base::scoped_nsobject<NSMenuItem> appItem( [[NSMenuItem alloc] initWithTitle:itemStr action:@selector(executeApplication:) diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index 069c12f..ef6f3e8 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -333,7 +333,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWithContextMenuSelection) { WebContents* web_contents = GetFirstShellWindowWebContents(); ASSERT_TRUE(web_contents); content::ContextMenuParams params; - params.selection_text = ASCIIToUTF16("Hello World"); + params.selection_text = base::ASCIIToUTF16("Hello World"); scoped_ptr<PlatformAppContextMenu> menu; menu.reset(new PlatformAppContextMenu(web_contents, params)); menu->Init(); diff --git a/chrome/browser/apps/app_url_redirector_browsertest.cc b/chrome/browser/apps/app_url_redirector_browsertest.cc index c540614..dd5a4bc 100644 --- a/chrome/browser/apps/app_url_redirector_browsertest.cc +++ b/chrome/browser/apps/app_url_redirector_browsertest.cc @@ -155,7 +155,7 @@ void PlatformAppUrlRedirectorBrowserTest::TestMismatchingNavigationInTab( InstallPlatformApp(handler); - const base::string16 success_title = ASCIIToUTF16(success_tab_title); + const base::string16 success_title = base::ASCIIToUTF16(success_tab_title); content::WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); content::TitleWatcher title_watcher(tab, success_title); @@ -181,8 +181,8 @@ void PlatformAppUrlRedirectorBrowserTest::TestNegativeXhrInTab( InstallPlatformApp(handler); - const base::string16 success_title = ASCIIToUTF16(success_tab_title); - const base::string16 failure_title = ASCIIToUTF16(failure_tab_title); + const base::string16 success_title = base::ASCIIToUTF16(success_tab_title); + const base::string16 failure_title = base::ASCIIToUTF16(failure_tab_title); content::WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); content::TitleWatcher title_watcher(tab, success_title); @@ -297,7 +297,7 @@ void PlatformAppUrlRedirectorBrowserTest::TestNegativeNavigationInBrowser( InstallPlatformApp(handler); - const base::string16 success_title = ASCIIToUTF16(success_tab_title); + const base::string16 success_title = base::ASCIIToUTF16(success_tab_title); content::WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); content::TitleWatcher title_watcher(tab, success_title); diff --git a/chrome/browser/apps/shortcut_manager.cc b/chrome/browser/apps/shortcut_manager.cc index 4d2ff6d..e51653e 100644 --- a/chrome/browser/apps/shortcut_manager.cc +++ b/chrome/browser/apps/shortcut_manager.cc @@ -126,7 +126,8 @@ void AppShortcutManager::Observe(int type, base::Callback<void(const ShellIntegration::ShortcutInfo&)> create_or_update; if (installed_info->is_update) { - base::string16 old_title = UTF8ToUTF16(installed_info->old_name); + base::string16 old_title = + base::UTF8ToUTF16(installed_info->old_name); create_or_update = base::Bind(&web_app::UpdateAllShortcuts, old_title); } else { diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index ed32d5b..e74f8be 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -449,8 +449,8 @@ class WebViewTest : public extensions::PlatformAppBrowserTest { void ExecuteScriptWaitForTitle(content::WebContents* web_contents, const char* script, const char* title) { - base::string16 expected_title(ASCIIToUTF16(title)); - base::string16 error_title(ASCIIToUTF16("error")); + base::string16 expected_title(base::ASCIIToUTF16(title)); + base::string16 error_title(base::ASCIIToUTF16("error")); content::TitleWatcher title_watcher(web_contents, expected_title); title_watcher.AlsoWaitForTitle(error_title); @@ -1552,8 +1552,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, SpeechRecognition) { // way that this will trigger clicking on speech recognition input mic. SimulateMouseClick(guest_web_contents, 0, blink::WebMouseEvent::ButtonLeft); - base::string16 expected_title(ASCIIToUTF16("PASSED")); - base::string16 error_title(ASCIIToUTF16("FAILED")); + base::string16 expected_title(base::ASCIIToUTF16("PASSED")); + base::string16 error_title(base::ASCIIToUTF16("FAILED")); content::TitleWatcher title_watcher(guest_web_contents, expected_title); title_watcher.AlsoWaitForTitle(error_title); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); diff --git a/chrome/browser/apps/web_view_interactive_browsertest.cc b/chrome/browser/apps/web_view_interactive_browsertest.cc index 15a1bba..96dc6dc 100644 --- a/chrome/browser/apps/web_view_interactive_browsertest.cc +++ b/chrome/browser/apps/web_view_interactive_browsertest.cc @@ -297,8 +297,8 @@ class WebViewInteractiveTest }; void WaitForTitle(const char* title) { - base::string16 expected_title(ASCIIToUTF16(title)); - base::string16 error_title(ASCIIToUTF16("FAILED")); + base::string16 expected_title(base::ASCIIToUTF16(title)); + base::string16 error_title(base::ASCIIToUTF16("FAILED")); content::TitleWatcher title_watcher(guest_web_contents(), expected_title); title_watcher.AlsoWaitForTitle(error_title); ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle()); @@ -324,8 +324,8 @@ class WebViewInteractiveTest ASSERT_TRUE(!popup_rwh->IsRenderView()); ASSERT_TRUE(popup_rwh->GetView()); - base::string16 expected_title = ASCIIToUTF16("PASSED2"); - base::string16 error_title = ASCIIToUTF16("FAILED"); + base::string16 expected_title = base::ASCIIToUTF16("PASSED2"); + base::string16 error_title = base::ASCIIToUTF16("FAILED"); content::TitleWatcher title_watcher(guest_web_contents(), expected_title); title_watcher.AlsoWaitForTitle(error_title); EXPECT_TRUE(content::ExecuteScript(guest_web_contents(), diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index eb0a59f..321a482 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -41,10 +41,10 @@ base::string16 AutocompleteResultAsString(const AutocompleteResult& result) { for (size_t i = 0; i < result.size(); ++i) { AutocompleteMatch match = result.match_at(i); output.append(base::StringPrintf("[\"%s\" by \"%s\"] ", - UTF16ToUTF8(match.contents).c_str(), + base::UTF16ToUTF8(match.contents).c_str(), match.provider->GetName())); } - return UTF8ToUTF16(output); + return base::UTF8ToUTF16(output); } } // namespace @@ -78,33 +78,37 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) { OmniboxView* omnibox_view = location_bar->GetOmniboxView(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across // platforms. location_bar->FocusLocation(true); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); EXPECT_TRUE(omnibox_view->IsSelectAll()); - omnibox_view->SetUserText(ASCIIToUTF16("chrome")); + omnibox_view->SetUserText(base::ASCIIToUTF16("chrome")); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("chrome"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("chrome"), omnibox_view->GetText()); EXPECT_FALSE(omnibox_view->IsSelectAll()); omnibox_view->RevertAll(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); EXPECT_FALSE(omnibox_view->IsSelectAll()); - omnibox_view->SetUserText(ASCIIToUTF16("chrome")); + omnibox_view->SetUserText(base::ASCIIToUTF16("chrome")); location_bar->Revert(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); EXPECT_FALSE(omnibox_view->IsSelectAll()); } @@ -137,8 +141,8 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) { { omnibox_view->model()->SetInputInProgress(true); autocomplete_controller->Start(AutocompleteInput( - ASCIIToUTF16("chrome"), base::string16::npos, base::string16(), GURL(), - AutocompleteInput::NTP, true, false, true, + base::ASCIIToUTF16("chrome"), base::string16::npos, base::string16(), + GURL(), AutocompleteInput::NTP, true, false, true, AutocompleteInput::SYNCHRONOUS_MATCHES)); EXPECT_TRUE(autocomplete_controller->done()); @@ -158,7 +162,8 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) { { location_bar->Revert(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); EXPECT_FALSE(omnibox_view->IsSelectAll()); const AutocompleteResult& result = autocomplete_controller->result(); EXPECT_TRUE(result.empty()) << AutocompleteResultAsString(result); @@ -178,7 +183,8 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) { // and select all. LocationBar* location_bar = GetLocationBar(); OmniboxView* omnibox_view = location_bar->GetOmniboxView(); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); omnibox_view->SetUserText(base::string16()); content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, @@ -186,9 +192,11 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) { chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL), content::PAGE_TRANSITION_AUTO_TOPLEVEL); observer.Wait(); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); chrome::CloseTab(browser()); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); EXPECT_TRUE(omnibox_view->IsSelectAll()); } @@ -206,11 +214,12 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) { // Focus search when omnibox is blank { EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), + omnibox_view->GetText()); location_bar->FocusSearch(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText()); size_t selection_start, selection_end; omnibox_view->GetSelectionBounds(&selection_start, &selection_end); @@ -220,13 +229,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) { // Focus search when omnibox is _not_ alread in forced query mode. { - omnibox_view->SetUserText(ASCIIToUTF16("foo")); + omnibox_view->SetUserText(base::ASCIIToUTF16("foo")); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("foo"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("foo"), omnibox_view->GetText()); location_bar->FocusSearch(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText()); size_t selection_start, selection_end; omnibox_view->GetSelectionBounds(&selection_start, &selection_end); @@ -237,13 +246,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) { // Focus search when omnibox _is_ already in forced query mode, but no query // has been typed. { - omnibox_view->SetUserText(ASCIIToUTF16("?")); + omnibox_view->SetUserText(base::ASCIIToUTF16("?")); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText()); location_bar->FocusSearch(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText()); size_t selection_start, selection_end; omnibox_view->GetSelectionBounds(&selection_start, &selection_end); @@ -254,13 +263,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) { // Focus search when omnibox _is_ already in forced query mode, and some query // has been typed. { - omnibox_view->SetUserText(ASCIIToUTF16("?foo")); + omnibox_view->SetUserText(base::ASCIIToUTF16("?foo")); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("?foo"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("?foo"), omnibox_view->GetText()); location_bar->FocusSearch(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16("?foo"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16("?foo"), omnibox_view->GetText()); size_t selection_start, selection_end; omnibox_view->GetSelectionBounds(&selection_start, &selection_end); @@ -270,13 +279,13 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) { // Focus search when omnibox is in forced query mode with leading whitespace. { - omnibox_view->SetUserText(ASCIIToUTF16(" ?foo")); + omnibox_view->SetUserText(base::ASCIIToUTF16(" ?foo")); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16(" ?foo"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16(" ?foo"), omnibox_view->GetText()); location_bar->FocusSearch(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(ASCIIToUTF16(" ?foo"), omnibox_view->GetText()); + EXPECT_EQ(base::ASCIIToUTF16(" ?foo"), omnibox_view->GetText()); size_t selection_start, selection_end; omnibox_view->GetSelectionBounds(&selection_start, &selection_end); diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc index 172143c..a2b637e 100644 --- a/chrome/browser/autocomplete/autocomplete_input.cc +++ b/chrome/browser/autocomplete/autocomplete_input.cc @@ -149,8 +149,8 @@ AutocompleteInput::Type AutocompleteInput::Parse( if (scheme) *scheme = parsed_scheme; if (canonicalized_url) { - *canonicalized_url = URLFixerUpper::FixupURL(UTF16ToUTF8(text), - UTF16ToUTF8(desired_tld)); + *canonicalized_url = URLFixerUpper::FixupURL( + base::UTF16ToUTF8(text), base::UTF16ToUTF8(desired_tld)); } if (LowerCaseEqualsASCII(parsed_scheme, chrome::kFileScheme)) { @@ -197,7 +197,8 @@ AutocompleteInput::Type AutocompleteInput::Parse( // open them, but users still can. // TODO(viettrungluu): get rid of conversion. ExternalProtocolHandler::BlockState block_state = - ExternalProtocolHandler::GetBlockState(UTF16ToUTF8(parsed_scheme)); + ExternalProtocolHandler::GetBlockState( + base::UTF16ToUTF8(parsed_scheme)); switch (block_state) { case ExternalProtocolHandler::DONT_BLOCK: return URL; @@ -211,15 +212,16 @@ AutocompleteInput::Type AutocompleteInput::Parse( // We don't know about this scheme. It might be that the user typed a // URL of the form "username:password@foo.com". const base::string16 http_scheme_prefix = - ASCIIToUTF16(std::string(content::kHttpScheme) + - content::kStandardSchemeSeparator); + base::ASCIIToUTF16(std::string(content::kHttpScheme) + + content::kStandardSchemeSeparator); url_parse::Parsed http_parts; base::string16 http_scheme; GURL http_canonicalized_url; Type http_type = Parse(http_scheme_prefix + text, desired_tld, &http_parts, &http_scheme, &http_canonicalized_url); - DCHECK_EQ(std::string(content::kHttpScheme), UTF16ToUTF8(http_scheme)); + DCHECK_EQ(std::string(content::kHttpScheme), + base::UTF16ToUTF8(http_scheme)); if (http_type == URL && http_parts.username.is_nonempty() && @@ -274,7 +276,7 @@ AutocompleteInput::Type AutocompleteInput::Parse( const base::string16 host(text.substr(parts->host.begin, parts->host.len)); const size_t registry_length = net::registry_controlled_domains::GetRegistryLength( - UTF16ToUTF8(host), + base::UTF16ToUTF8(host), net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); if (registry_length == std::string::npos) { @@ -286,7 +288,7 @@ AutocompleteInput::Type AutocompleteInput::Parse( host_with_tld += desired_tld; const size_t tld_length = net::registry_controlled_domains::GetRegistryLength( - UTF16ToUTF8(host_with_tld), + base::UTF16ToUTF8(host_with_tld), net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); if (tld_length != std::string::npos) @@ -302,11 +304,11 @@ AutocompleteInput::Type AutocompleteInput::Parse( // unlikely that a user would be trying to type those in for anything other // than a search query. url_canon::CanonHostInfo host_info; - const std::string canonicalized_host(net::CanonicalizeHost(UTF16ToUTF8(host), - &host_info)); + const std::string canonicalized_host(net::CanonicalizeHost( + base::UTF16ToUTF8(host), &host_info)); if ((host_info.family == url_canon::CanonHostInfo::NEUTRAL) && !net::IsCanonicalizedHostCompliant(canonicalized_host, - UTF16ToUTF8(desired_tld))) { + base::UTF16ToUTF8(desired_tld))) { // Invalid hostname. There are several possible cases: // * Our checker is too strict and the user pasted in a real-world URL // that's "invalid" but resolves. To catch these, we return UNKNOWN when @@ -393,7 +395,7 @@ AutocompleteInput::Type AutocompleteInput::Parse( // default and let users correct us on a case-by-case basis. // Note that we special-case "localhost" as a known hostname. if ((host_info.family != url_canon::CanonHostInfo::IPV4) && - ((registry_length != 0) || (host == ASCIIToUTF16("localhost") || + ((registry_length != 0) || (host == base::ASCIIToUTF16("localhost") || parts->port.is_nonempty()))) return parts->username.is_nonempty() ? UNKNOWN : URL; @@ -502,7 +504,7 @@ int AutocompleteInput::NumNonHostComponents(const url_parse::Parsed& parts) { // static bool AutocompleteInput::HasHTTPScheme(const base::string16& input) { - std::string utf8_input(UTF16ToUTF8(input)); + std::string utf8_input(base::UTF16ToUTF8(input)); url_parse::Component scheme; if (url_util::FindAndCompareScheme(utf8_input, content::kViewSourceScheme, &scheme)) diff --git a/chrome/browser/autocomplete/autocomplete_input_unittest.cc b/chrome/browser/autocomplete/autocomplete_input_unittest.cc index f3110a9..2720f30 100644 --- a/chrome/browser/autocomplete/autocomplete_input_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_input_unittest.cc @@ -11,6 +11,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "url/url_parse.h" +using base::ASCIIToUTF16; + TEST(AutocompleteInputTest, InputType) { struct test_data { const base::string16 input; @@ -106,7 +108,7 @@ TEST(AutocompleteInputTest, InputType) { { ASCIIToUTF16("127.0.1"), AutocompleteInput::UNKNOWN }, { ASCIIToUTF16("127.0.1/"), AutocompleteInput::URL }, { ASCIIToUTF16("browser.tabs.closeButtons"), AutocompleteInput::UNKNOWN }, - { WideToUTF16(L"\u6d4b\u8bd5"), AutocompleteInput::UNKNOWN }, + { base::WideToUTF16(L"\u6d4b\u8bd5"), AutocompleteInput::UNKNOWN }, { ASCIIToUTF16("[2001:]"), AutocompleteInput::QUERY }, { ASCIIToUTF16("[2001:dB8::1]"), AutocompleteInput::URL }, { ASCIIToUTF16("192.168.0.256"), AutocompleteInput::QUERY }, @@ -163,7 +165,7 @@ TEST(AutocompleteInputTest, InputTypeWithDesiredTLD) { // This tests for a regression where certain input in the omnibox caused us to // crash. As long as the test completes without crashing, we're fine. TEST(AutocompleteInputTest, InputCrash) { - AutocompleteInput input(WideToUTF16(L"\uff65@s"), base::string16::npos, + AutocompleteInput input(base::WideToUTF16(L"\uff65@s"), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, true, false, true, AutocompleteInput::ALL_MATCHES); @@ -185,7 +187,7 @@ TEST(AutocompleteInputTest, ParseForEmphasizeComponent) { { ASCIIToUTF16("http://foo/bar baz"), Component(0, 4), Component(7, 3) }, { ASCIIToUTF16("link:foo.com"), Component(0, 4), kInvalidComponent }, { ASCIIToUTF16("www.foo.com:81"), kInvalidComponent, Component(0, 11) }, - { WideToUTF16(L"\u6d4b\u8bd5"), kInvalidComponent, Component(0, 2) }, + { base::WideToUTF16(L"\u6d4b\u8bd5"), kInvalidComponent, Component(0, 2) }, { ASCIIToUTF16("view-source:http://www.foo.com/"), Component(12, 4), Component(19, 11) }, { ASCIIToUTF16("view-source:https://example.com/"), diff --git a/chrome/browser/autocomplete/autocomplete_match.cc b/chrome/browser/autocomplete/autocomplete_match.cc index 2fc5e68..768d32f 100644 --- a/chrome/browser/autocomplete/autocomplete_match.cc +++ b/chrome/browser/autocomplete/autocomplete_match.cc @@ -439,7 +439,8 @@ void AutocompleteMatch::RecordAdditionalInfo(const std::string& property, void AutocompleteMatch::RecordAdditionalInfo(const std::string& property, const base::Time& value) { RecordAdditionalInfo(property, - UTF16ToUTF8(base::TimeFormatShortDateAndTime(value))); + base::UTF16ToUTF8( + base::TimeFormatShortDateAndTime(value))); } std::string AutocompleteMatch::GetAdditionalInfo( diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc index e593003..488741e 100644 --- a/chrome/browser/autocomplete/autocomplete_provider.cc +++ b/chrome/browser/autocomplete/autocomplete_provider.cc @@ -141,8 +141,8 @@ void AutocompleteProvider::UpdateStarredStateOfMatches() { bool AutocompleteProvider::FixupUserInput(AutocompleteInput* input) { const base::string16& input_text = input->text(); // Fixup and canonicalize user input. - const GURL canonical_gurl(URLFixerUpper::FixupURL(UTF16ToUTF8(input_text), - std::string())); + const GURL canonical_gurl(URLFixerUpper::FixupURL( + base::UTF16ToUTF8(input_text), std::string())); std::string canonical_gurl_str(canonical_gurl.possibly_invalid_spec()); if (canonical_gurl_str.empty()) { // This probably won't happen, but there are no guarantees. @@ -158,8 +158,8 @@ bool AutocompleteProvider::FixupUserInput(AutocompleteInput* input) { if ((input->type() != AutocompleteInput::URL) && canonical_gurl.HostIsIPAddress()) { std::string original_hostname = - UTF16ToUTF8(input_text.substr(input->parts().host.begin, - input->parts().host.len)); + base::UTF16ToUTF8(input_text.substr(input->parts().host.begin, + input->parts().host.len)); const url_parse::Parsed& parts = canonical_gurl.parsed_for_possibly_invalid_spec(); // parts.host must not be empty when HostIsIPAddress() is true. @@ -167,7 +167,7 @@ bool AutocompleteProvider::FixupUserInput(AutocompleteInput* input) { canonical_gurl_str.replace(parts.host.begin, parts.host.len, original_hostname); } - base::string16 output = UTF8ToUTF16(canonical_gurl_str); + base::string16 output = base::UTF8ToUTF16(canonical_gurl_str); // Don't prepend a scheme when the user didn't have one. Since the fixer // upper only prepends the "http" scheme, that's all we need to check for. if (!AutocompleteInput::HasHTTPScheme(input_text)) @@ -188,12 +188,12 @@ bool AutocompleteProvider::FixupUserInput(AutocompleteInput* input) { // clear that the result of fixup really matters in this case, but there's no // harm in making sure. const size_t last_input_nonslash = - input_text.find_last_not_of(ASCIIToUTF16("/\\")); + input_text.find_last_not_of(base::ASCIIToUTF16("/\\")); const size_t num_input_slashes = (last_input_nonslash == base::string16::npos) ? input_text.length() : (input_text.length() - 1 - last_input_nonslash); const size_t last_output_nonslash = - output.find_last_not_of(ASCIIToUTF16("/\\")); + output.find_last_not_of(base::ASCIIToUTF16("/\\")); const size_t num_output_slashes = (last_output_nonslash == base::string16::npos) ? output.length() : (output.length() - 1 - last_output_nonslash); @@ -214,7 +214,7 @@ size_t AutocompleteProvider::TrimHttpPrefix(base::string16* url) { if (!AutocompleteInput::HasHTTPScheme(*url)) return 0; size_t scheme_pos = - url->find(ASCIIToUTF16(content::kHttpScheme) + char16(':')); + url->find(base::ASCIIToUTF16(content::kHttpScheme) + char16(':')); DCHECK_NE(base::string16::npos, scheme_pos); // Erase scheme plus up to two slashes. diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index c5dff86..96977f3 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -88,13 +88,13 @@ void TestProvider::Start(const AutocompleteInput& input, AddResults(0, 1); AddResultsWithSearchTermsArgs( 1, 1, AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, - TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("echo"))); + TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("echo"))); AddResultsWithSearchTermsArgs( 2, 1, AutocompleteMatchType::NAVSUGGEST, - TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("nav"))); + TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("nav"))); AddResultsWithSearchTermsArgs( 3, 1, AutocompleteMatchType::SEARCH_SUGGEST, - TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("query"))); + TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("query"))); if (input.matches_requested() == AutocompleteInput::ALL_MATCHES) { done_ = false; @@ -127,8 +127,8 @@ void TestProvider::AddResultsWithSearchTermsArgs( for (int i = start_at; i < num; i++) { AutocompleteMatch match(this, relevance_ - i, false, type); - match.fill_into_edit = prefix_ + UTF8ToUTF16(base::IntToString(i)); - match.destination_url = GURL(UTF16ToUTF8(match.fill_into_edit)); + match.fill_into_edit = prefix_ + base::UTF8ToUTF16(base::IntToString(i)); + match.destination_url = GURL(base::UTF16ToUTF8(match.fill_into_edit)); match.allowed_to_be_default_match = true; match.contents = match.fill_into_edit; @@ -242,7 +242,7 @@ void AutocompleteProviderTest::ResetControllerWithTestProviders( // (2) Inject test arguments rather than rely on the hardcoded values, e.g. // don't rely on kResultsPerProvided and default relevance ordering // (B > A). - RegisterTemplateURL(ASCIIToUTF16(kTestTemplateURLKeyword), + RegisterTemplateURL(base::ASCIIToUTF16(kTestTemplateURLKeyword), "http://aqs/{searchTerms}/{google:assistedQueryStats}"); ACProviders providers; @@ -250,15 +250,16 @@ void AutocompleteProviderTest::ResetControllerWithTestProviders( // Construct two new providers, with either the same or different prefixes. TestProvider* provider1 = new TestProvider( kResultsPerProvider, - ASCIIToUTF16("http://a"), + base::ASCIIToUTF16("http://a"), &profile_, - ASCIIToUTF16(kTestTemplateURLKeyword)); + base::ASCIIToUTF16(kTestTemplateURLKeyword)); provider1->AddRef(); providers.push_back(provider1); TestProvider* provider2 = new TestProvider( kResultsPerProvider * 2, - same_destinations ? ASCIIToUTF16("http://a") : ASCIIToUTF16("http://b"), + same_destinations ? base::ASCIIToUTF16("http://a") + : base::ASCIIToUTF16("http://b"), &profile_, base::string16()); provider2->AddRef(); @@ -302,8 +303,8 @@ void AutocompleteProviderTest:: ASSERT_NE(0, default_provider_id); // Create another TemplateURL for KeywordProvider. - data.short_name = ASCIIToUTF16("k"); - data.SetKeyword(ASCIIToUTF16("k")); + data.short_name = base::ASCIIToUTF16("k"); + data.SetKeyword(base::ASCIIToUTF16("k")); data.SetURL("http://keyword/{searchTerms}"); TemplateURL* keyword_t_url = new TemplateURL(&profile_, data); turl_model->Add(keyword_t_url); @@ -323,16 +324,16 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() { // Create a TemplateURL for KeywordProvider. TemplateURLData data; - data.short_name = ASCIIToUTF16("foo.com"); - data.SetKeyword(ASCIIToUTF16("foo.com")); + data.short_name = base::ASCIIToUTF16("foo.com"); + data.SetKeyword(base::ASCIIToUTF16("foo.com")); data.SetURL("http://foo.com/{searchTerms}"); TemplateURL* keyword_t_url = new TemplateURL(&profile_, data); turl_model->Add(keyword_t_url); ASSERT_NE(0, keyword_t_url->id()); // Create another TemplateURL for KeywordProvider. - data.short_name = ASCIIToUTF16("bar.com"); - data.SetKeyword(ASCIIToUTF16("bar.com")); + data.short_name = base::ASCIIToUTF16("bar.com"); + data.SetKeyword(base::ASCIIToUTF16("bar.com")); data.SetURL("http://bar.com/{searchTerms}"); keyword_t_url = new TemplateURL(&profile_, data); turl_model->Add(keyword_t_url); @@ -343,7 +344,7 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() { } void AutocompleteProviderTest::RunTest() { - RunQuery(ASCIIToUTF16("a")); + RunQuery(base::ASCIIToUTF16("a")); } void AutocompleteProviderTest::RunRedundantKeywordTest( @@ -380,7 +381,7 @@ void AutocompleteProviderTest::RunAssistedQueryStatsTest( AutocompleteMatch match(NULL, kMaxRelevance - i, false, aqs_test_data[i].match_type); match.allowed_to_be_default_match = true; - match.keyword = ASCIIToUTF16(kTestTemplateURLKeyword); + match.keyword = base::ASCIIToUTF16(kTestTemplateURLKeyword); match.search_terms_args.reset( new TemplateURLRef::SearchTermsArgs(base::string16())); matches.push_back(match); @@ -420,9 +421,9 @@ void AutocompleteProviderTest::RunExactKeymatchTest( // be from SearchProvider. (It provides all verbatim search matches, // keyword or not.) controller_->Start(AutocompleteInput( - ASCIIToUTF16("k test"), base::string16::npos, base::string16(), GURL(), - AutocompleteInput::INVALID_SPEC, true, false, allow_exact_keyword_match, - AutocompleteInput::SYNCHRONOUS_MATCHES)); + base::ASCIIToUTF16("k test"), base::string16::npos, base::string16(), + GURL(), AutocompleteInput::INVALID_SPEC, true, false, + allow_exact_keyword_match, AutocompleteInput::SYNCHRONOUS_MATCHES)); EXPECT_TRUE(controller_->done()); EXPECT_EQ(AutocompleteProvider::TYPE_SEARCH, controller_->result().default_match()->provider->type()); @@ -528,9 +529,9 @@ TEST_F(AutocompleteProviderTest, RedundantKeywordsIgnoredInResult) { { KeywordTestData duplicate_url[] = { - { ASCIIToUTF16("fo"), base::string16(), false }, - { ASCIIToUTF16("foo.com"), base::string16(), true }, - { ASCIIToUTF16("foo.com"), base::string16(), false } + { base::ASCIIToUTF16("fo"), base::string16(), false }, + { base::ASCIIToUTF16("foo.com"), base::string16(), true }, + { base::ASCIIToUTF16("foo.com"), base::string16(), false } }; SCOPED_TRACE("Duplicate url"); @@ -539,8 +540,8 @@ TEST_F(AutocompleteProviderTest, RedundantKeywordsIgnoredInResult) { { KeywordTestData keyword_match[] = { - { ASCIIToUTF16("foo.com"), ASCIIToUTF16("foo.com"), false }, - { ASCIIToUTF16("foo.com"), base::string16(), false } + { base::ASCIIToUTF16("foo.com"), base::ASCIIToUTF16("foo.com"), false }, + { base::ASCIIToUTF16("foo.com"), base::string16(), false } }; SCOPED_TRACE("Duplicate url with keyword match"); @@ -549,10 +550,10 @@ TEST_F(AutocompleteProviderTest, RedundantKeywordsIgnoredInResult) { { KeywordTestData multiple_keyword[] = { - { ASCIIToUTF16("fo"), base::string16(), false }, - { ASCIIToUTF16("foo.com"), base::string16(), true }, - { ASCIIToUTF16("foo.com"), base::string16(), false }, - { ASCIIToUTF16("bar.com"), base::string16(), true }, + { base::ASCIIToUTF16("fo"), base::string16(), false }, + { base::ASCIIToUTF16("foo.com"), base::string16(), true }, + { base::ASCIIToUTF16("foo.com"), base::string16(), false }, + { base::ASCIIToUTF16("bar.com"), base::string16(), true }, }; SCOPED_TRACE("Duplicate url with multiple keywords"); @@ -617,13 +618,13 @@ TEST_F(AutocompleteProviderTest, GetDestinationURL) { EXPECT_TRUE(url.path().empty()); // The protocol needs to be https. - RegisterTemplateURL(ASCIIToUTF16(kTestTemplateURLKeyword), + RegisterTemplateURL(base::ASCIIToUTF16(kTestTemplateURLKeyword), "https://aqs/{searchTerms}/{google:assistedQueryStats}"); url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); EXPECT_TRUE(url.path().empty()); // There needs to be a keyword provider. - match.keyword = ASCIIToUTF16(kTestTemplateURLKeyword); + match.keyword = base::ASCIIToUTF16(kTestTemplateURLKeyword); url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); EXPECT_TRUE(url.path().empty()); diff --git a/chrome/browser/autocomplete/autocomplete_result.cc b/chrome/browser/autocomplete/autocomplete_result.cc index 1a198c36..f5ed15d 100644 --- a/chrome/browser/autocomplete/autocomplete_result.cc +++ b/chrome/browser/autocomplete/autocomplete_result.cc @@ -194,11 +194,15 @@ void AutocompleteResult::SortAndCull(const AutocompleteInput& input, default_match_ = matches_.begin(); if (default_match_ != matches_.end()) { - const base::string16 debug_info = ASCIIToUTF16("fill_into_edit=") + - default_match_->fill_into_edit + ASCIIToUTF16(", provider=") + - ((default_match_->provider != NULL) ? - ASCIIToUTF16(default_match_->provider->GetName()) : base::string16()) + - ASCIIToUTF16(", input=") + input.text(); + const base::string16 debug_info = + base::ASCIIToUTF16("fill_into_edit=") + + default_match_->fill_into_edit + + base::ASCIIToUTF16(", provider=") + + ((default_match_->provider != NULL) + ? base::ASCIIToUTF16(default_match_->provider->GetName()) + : base::string16()) + + base::ASCIIToUTF16(", input=") + + input.text(); DCHECK(default_match_->allowed_to_be_default_match) << debug_info; // We shouldn't get query matches for URL inputs, or non-query matches // for query inputs. diff --git a/chrome/browser/autocomplete/autocomplete_result_unittest.cc b/chrome/browser/autocomplete/autocomplete_result_unittest.cc index e7e1795..91c682e 100644 --- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc @@ -168,7 +168,7 @@ void AutocompleteResultTest::RunCopyOldMatchesTest( const TestData* last, size_t last_size, const TestData* current, size_t current_size, const TestData* expected, size_t expected_size) { - AutocompleteInput input(ASCIIToUTF16("a"), base::string16::npos, + AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, AutocompleteInput::ALL_MATCHES); @@ -204,7 +204,7 @@ TEST_F(AutocompleteResultTest, Swap) { AutocompleteMatch match; match.relevance = 1; match.allowed_to_be_default_match = true; - AutocompleteInput input(ASCIIToUTF16("a"), base::string16::npos, + AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, AutocompleteInput::ALL_MATCHES); @@ -310,8 +310,8 @@ TEST_F(AutocompleteResultTest, SortAndCullEmptyDestinationURLs) { TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) { // Register a template URL that corresponds to 'foo' search engine. TemplateURLData url_data; - url_data.short_name = ASCIIToUTF16("unittest"); - url_data.SetKeyword(ASCIIToUTF16("foo")); + url_data.short_name = base::ASCIIToUTF16("unittest"); + url_data.SetKeyword(base::ASCIIToUTF16("foo")); url_data.SetURL("http://www.foo.com/s?q={searchTerms}"); test_util_.model()->Add(new TemplateURL(test_util_.profile(), url_data)); diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc index 8035ed3..4455cc0 100644 --- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc +++ b/chrome/browser/autocomplete/bookmark_provider_unittest.cc @@ -82,7 +82,7 @@ void BookmarkProviderTest::SetUp() { const BookmarksTestInfo& cur(bookmark_provider_test_data[i]); const GURL url(cur.url); model_->AddURL(other_node, other_node->child_count(), - ASCIIToUTF16(cur.title), url); + base::ASCIIToUTF16(cur.title), url); } } @@ -118,9 +118,9 @@ std::string TestBookmarkPositionsAsString( base::string16 MatchesAsString16(const ACMatches& matches) { base::string16 matches_string; for (ACMatches::const_iterator i = matches.begin(); i != matches.end(); ++i) { - matches_string.append(ASCIIToUTF16(" '")); + matches_string.append(base::ASCIIToUTF16(" '")); matches_string.append(i->description); - matches_string.append(ASCIIToUTF16("'\n")); + matches_string.append(base::ASCIIToUTF16("'\n")); } return matches_string; } @@ -242,7 +242,7 @@ TEST_F(BookmarkProviderTest, Positions) { }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) { - AutocompleteInput input(ASCIIToUTF16(query_data[i].query), + AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, AutocompleteInput::ALL_MATCHES); @@ -316,7 +316,7 @@ TEST_F(BookmarkProviderTest, Rankings) { }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(query_data); ++i) { - AutocompleteInput input(ASCIIToUTF16(query_data[i].query), + AutocompleteInput input(base::ASCIIToUTF16(query_data[i].query), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, AutocompleteInput::ALL_MATCHES); @@ -326,7 +326,7 @@ TEST_F(BookmarkProviderTest, Rankings) { for (size_t j = 0; j < std::max(query_data[i].match_count, matches.size()); ++j) { EXPECT_LT(j, query_data[i].match_count) << " Unexpected match '" - << UTF16ToUTF8(matches[j].description) << "' for query: '" + << base::UTF16ToUTF8(matches[j].description) << "' for query: '" << query_data[i].query << "'."; if (j >= query_data[i].match_count) continue; @@ -335,7 +335,8 @@ TEST_F(BookmarkProviderTest, Rankings) { << query_data[i].query << "'."; if (j >= matches.size()) continue; - EXPECT_EQ(query_data[i].matches[j], UTF16ToUTF8(matches[j].description)) + EXPECT_EQ(query_data[i].matches[j], + base::UTF16ToUTF8(matches[j].description)) << " Mismatch at [" << base::IntToString(j) << "] for query '" << query_data[i].query << "'."; EXPECT_FALSE(matches[j].allowed_to_be_default_match); diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc index f66be07..1aac79f 100644 --- a/chrome/browser/autocomplete/builtin_provider.cc +++ b/chrome/browser/autocomplete/builtin_provider.cc @@ -46,11 +46,13 @@ BuiltinProvider::BuiltinProvider(AutocompleteProviderListener* listener, std::sort(builtins.begin(), builtins.end()); for (std::vector<std::string>::iterator i(builtins.begin()); i != builtins.end(); ++i) - builtins_.push_back(ASCIIToUTF16(*i)); - base::string16 settings(ASCIIToUTF16(chrome::kChromeUISettingsHost) + - ASCIIToUTF16("/")); - for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++) - builtins_.push_back(settings + ASCIIToUTF16(kChromeSettingsSubPages[i])); + builtins_.push_back(base::ASCIIToUTF16(*i)); + base::string16 settings(base::ASCIIToUTF16(chrome::kChromeUISettingsHost) + + base::ASCIIToUTF16("/")); + for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++) { + builtins_.push_back( + settings + base::ASCIIToUTF16(kChromeSettingsSubPages[i])); + } } void BuiltinProvider::Start(const AutocompleteInput& input, @@ -61,10 +63,10 @@ void BuiltinProvider::Start(const AutocompleteInput& input, (input.type() == AutocompleteInput::QUERY)) return; - const base::string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) + - ASCIIToUTF16(content::kStandardSchemeSeparator); - const base::string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) + - ASCIIToUTF16(content::kStandardSchemeSeparator); + const base::string16 kAbout = base::ASCIIToUTF16(chrome::kAboutScheme) + + base::ASCIIToUTF16(content::kStandardSchemeSeparator); + const base::string16 kChrome = base::ASCIIToUTF16(chrome::kChromeUIScheme) + + base::ASCIIToUTF16(content::kStandardSchemeSeparator); const int kUrl = ACMatchClassification::URL; const int kMatch = kUrl | ACMatchClassification::MATCH; @@ -82,22 +84,22 @@ void BuiltinProvider::Start(const AutocompleteInput& input, if (highlight) styles.push_back(ACMatchClassification(offset, kUrl)); // Include some common builtin chrome URLs as the user types the scheme. - AddMatch(ASCIIToUTF16(chrome::kChromeUIChromeURLsURL), base::string16(), - styles); - AddMatch(ASCIIToUTF16(chrome::kChromeUISettingsURL), base::string16(), - styles); - AddMatch(ASCIIToUTF16(chrome::kChromeUIVersionURL), base::string16(), - styles); + AddMatch(base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL), + base::string16(), styles); + AddMatch(base::ASCIIToUTF16(chrome::kChromeUISettingsURL), + base::string16(), styles); + AddMatch(base::ASCIIToUTF16(chrome::kChromeUIVersionURL), + base::string16(), styles); } else { // Match input about: or chrome: URL input against builtin chrome URLs. - GURL url = URLFixerUpper::FixupURL(UTF16ToUTF8(text), std::string()); + GURL url = URLFixerUpper::FixupURL(base::UTF16ToUTF8(text), std::string()); // BuiltinProvider doesn't know how to suggest valid ?query or #fragment // extensions to chrome: URLs. if (url.SchemeIs(chrome::kChromeUIScheme) && url.has_host() && !url.has_query() && !url.has_ref()) { // Include the path for sub-pages (e.g. "chrome://settings/browser"). - base::string16 host_and_path = UTF8ToUTF16(url.host() + url.path()); - base::TrimString(host_and_path, ASCIIToUTF16("/").c_str(), + base::string16 host_and_path = base::UTF8ToUTF16(url.host() + url.path()); + base::TrimString(host_and_path, base::ASCIIToUTF16("/").c_str(), &host_and_path); size_t match_length = kChrome.length() + host_and_path.length(); for (Builtins::const_iterator i(builtins_.begin()); diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc index 0f448e5..faec405 100644 --- a/chrome/browser/autocomplete/builtin_provider_unittest.cc +++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc @@ -14,6 +14,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" +using base::ASCIIToUTF16; + class BuiltinProviderTest : public testing::Test { protected: template<class ResultType> diff --git a/chrome/browser/autocomplete/contact_provider_chromeos.cc b/chrome/browser/autocomplete/contact_provider_chromeos.cc index 9def30b..7a37bf0 100644 --- a/chrome/browser/autocomplete/contact_provider_chromeos.cc +++ b/chrome/browser/autocomplete/contact_provider_chromeos.cc @@ -171,12 +171,12 @@ void ContactProvider::RefreshContacts() { for (contacts::ContactPointers::const_iterator it = contacts->begin(); it != contacts->end(); ++it) { const contacts::Contact& contact = **it; - base::string16 full_name = - AutocompleteMatch::SanitizeString(UTF8ToUTF16(contact.full_name())); - base::string16 given_name = - AutocompleteMatch::SanitizeString(UTF8ToUTF16(contact.given_name())); - base::string16 family_name = - AutocompleteMatch::SanitizeString(UTF8ToUTF16(contact.family_name())); + base::string16 full_name = AutocompleteMatch::SanitizeString( + base::UTF8ToUTF16(contact.full_name())); + base::string16 given_name = AutocompleteMatch::SanitizeString( + base::UTF8ToUTF16(contact.given_name())); + base::string16 family_name = AutocompleteMatch::SanitizeString( + base::UTF8ToUTF16(contact.family_name())); float affinity = contact.has_affinity() ? contact.affinity() : kDefaultAffinity; diff --git a/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc b/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc index e3b0df8..7e344f3 100644 --- a/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc +++ b/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc @@ -65,7 +65,7 @@ class ContactProviderTest : public testing::Test { // Starts a (synchronous) query for |utf8_text| in |contact_provider_|. void StartQuery(const std::string& utf8_text) { contact_provider_->Start( - AutocompleteInput(UTF8ToUTF16(utf8_text), + AutocompleteInput(base::UTF8ToUTF16(utf8_text), base::string16::npos, base::string16(), GURL(), diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc index 0998d7e..88efea6 100644 --- a/chrome/browser/autocomplete/extension_app_provider.cc +++ b/chrome/browser/autocomplete/extension_app_provider.cc @@ -173,8 +173,8 @@ void ExtensionAppProvider::RefreshAppList() { DCHECK(launch_url.is_valid()); ExtensionApp extension_app = { - UTF8ToUTF16(app->name()), - UTF8ToUTF16(launch_url.spec()), + base::UTF8ToUTF16(app->name()), + base::UTF8ToUTF16(launch_url.spec()), // Only hosted apps have recognizable URLs that users might type in, // packaged apps and hosted apps use chrome-extension:// URLs that are // normally not shown to users. diff --git a/chrome/browser/autocomplete/extension_app_provider_unittest.cc b/chrome/browser/autocomplete/extension_app_provider_unittest.cc index 24e8bd7..f40ef75 100644 --- a/chrome/browser/autocomplete/extension_app_provider_unittest.cc +++ b/chrome/browser/autocomplete/extension_app_provider_unittest.cc @@ -14,6 +14,8 @@ #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" +using base::ASCIIToUTF16; + class ExtensionAppProviderTest : public testing::Test { protected: struct test_data { @@ -75,7 +77,7 @@ void ExtensionAppProviderTest::SetUp() { // Populate the InMemoryDatabase. history::URLRow info(GURL(kExtensionApps[i].launch_url)); - info.set_title(UTF8ToUTF16(kExtensionApps[i].title)); + info.set_title(base::UTF8ToUTF16(kExtensionApps[i].title)); info.set_typed_count(kExtensionApps[i].typed_count); url_db->AddURL(info); } diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc index 0ae6b11..65acf3c 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -147,9 +147,10 @@ void HistoryQuickProvider::DoAutocomplete() { // provider completions compete with the URL-what-you-typed // match as normal. if (url_db) { - const std::string host(UTF16ToUTF8(autocomplete_input_.text().substr( - autocomplete_input_.parts().host.begin, - autocomplete_input_.parts().host.len))); + const std::string host(base::UTF16ToUTF8( + autocomplete_input_.text().substr( + autocomplete_input_.parts().host.begin, + autocomplete_input_.parts().host.len))); // We want to put the URL-what-you-typed match first if either // * the user visited the URL before (intranet or internet). // * it's a URL on a host that user visited before and this diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index d571bfa..1d02958 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_unittest.cc @@ -37,6 +37,7 @@ #include "sql/transaction.h" #include "testing/gtest/include/gtest/gtest.h" +using base::ASCIIToUTF16; using base::Time; using base::TimeDelta; diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc index 34b4d5d..7c9d479 100644 --- a/chrome/browser/autocomplete/history_url_provider.cc +++ b/chrome/browser/autocomplete/history_url_provider.cc @@ -101,7 +101,7 @@ GURL ConvertToHostOnly(const history::HistoryMatch& match, if ((host.spec().length() < (match.input_location + input.length()))) return GURL(); // User typing is longer than this host suggestion. - const base::string16 spec = UTF8ToUTF16(host.spec()); + const base::string16 spec = base::UTF8ToUTF16(host.spec()); if (spec.compare(match.input_location, input.length(), input)) return GURL(); // User typing is no longer a prefix. @@ -430,8 +430,8 @@ AutocompleteMatch HistoryURLProvider::SuggestExactInput( // This relies on match.destination_url being the non-prefix-trimmed version // of match.contents. match.contents = display_string; - const URLPrefix* best_prefix = - URLPrefix::BestURLPrefix(UTF8ToUTF16(destination_url.spec()), text); + const URLPrefix* best_prefix = URLPrefix::BestURLPrefix( + base::UTF8ToUTF16(destination_url.spec()), text); // It's possible for match.destination_url to not contain the user's input // at all (so |best_prefix| is NULL), for example if the input is // "view-source:x" and |destination_url| has an inserted "http://" in the @@ -521,14 +521,14 @@ void HistoryURLProvider::DoAutocomplete(history::HistoryBackend* backend, // to work with. CullRedirects() will then reduce the list to // the best kMaxMatches results. db->AutocompleteForPrefix( - UTF16ToUTF8(i->prefix + params->input.text()), + base::UTF16ToUTF8(i->prefix + params->input.text()), kMaxMatches * 2, (backend == NULL), &url_matches); for (history::URLRows::const_iterator j(url_matches.begin()); j != url_matches.end(); ++j) { const URLPrefix* best_prefix = - URLPrefix::BestURLPrefix(UTF8ToUTF16(j->url().spec()), + URLPrefix::BestURLPrefix(base::UTF8ToUTF16(j->url().spec()), base::string16()); DCHECK(best_prefix != NULL); history_matches.push_back(history::HistoryMatch(*j, i->prefix.length(), @@ -843,7 +843,7 @@ bool HistoryURLProvider::CanFindIntranetURL( !LowerCaseEqualsASCII(input.scheme(), content::kHttpScheme) || !input.parts().host.is_nonempty()) return false; - const std::string host(UTF16ToUTF8( + const std::string host(base::UTF16ToUTF8( input.text().substr(input.parts().host.begin, input.parts().host.len))); const size_t registry_length = net::registry_controlled_domains::GetRegistryLength( diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 993a18d..50e745e 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc @@ -28,6 +28,7 @@ #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" +using base::ASCIIToUTF16; using base::Time; using base::TimeDelta; @@ -247,14 +248,15 @@ void HistoryURLProviderTest::FillData() { for (size_t i = 0; i < arraysize(test_db); ++i) { const TestURLInfo& cur = test_db[i]; const GURL current_url(cur.url); - history_service_->AddPageWithDetails(current_url, UTF8ToUTF16(cur.title), + history_service_->AddPageWithDetails(current_url, + base::UTF8ToUTF16(cur.title), cur.visit_count, cur.typed_count, visit_time, false, history::SOURCE_BROWSED); } history_service_->AddPageWithDetails( - GURL("http://p/"), UTF8ToUTF16("p"), 0, 0, + GURL("http://p/"), base::UTF8ToUTF16("p"), 0, 0, Time::Now() - TimeDelta::FromDays(history::kLowQualityMatchAgeLimitInDays - 1), false, history::SOURCE_BROWSED); @@ -427,7 +429,7 @@ TEST_F(HistoryURLProviderTest, CullRedirects) { }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) { history_service_->AddPageWithDetails(GURL(test_cases[i].url), - UTF8ToUTF16("Title"), test_cases[i].count, test_cases[i].count, + ASCIIToUTF16("Title"), test_cases[i].count, test_cases[i].count, Time::Now(), false, history::SOURCE_BROWSED); } @@ -448,7 +450,7 @@ TEST_F(HistoryURLProviderTest, CullRedirects) { // "what you typed" result, plus this one. const base::string16 typing(ASCIIToUTF16("http://redirects/")); const UrlAndLegalDefault expected_results[] = { - { UTF16ToUTF8(typing), true }, + { base::UTF16ToUTF8(typing), true }, { test_cases[0].url, false } }; RunTest(typing, base::string16(), true, expected_results, @@ -490,9 +492,9 @@ TEST_F(HistoryURLProviderTest, Fixup) { const UrlAndLegalDefault fixup_crash[] = { { "http://%EF%BD%A5@s/", true } }; - RunTest(WideToUTF16(L"\uff65@s"), base::string16(), false, fixup_crash, + RunTest(base::WideToUTF16(L"\uff65@s"), base::string16(), false, fixup_crash, arraysize(fixup_crash)); - RunTest(WideToUTF16(L"\u2015\u2015@ \uff7c"), base::string16(), false, + RunTest(base::WideToUTF16(L"\u2015\u2015@ \uff7c"), base::string16(), false, NULL, 0); // Fixing up "file:" should result in an inline autocomplete offset of just @@ -806,7 +808,7 @@ TEST_F(HistoryURLProviderTest, CullSearchResults) { }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) { history_service_->AddPageWithDetails(GURL(test_cases[i].url), - UTF8ToUTF16("Title"), test_cases[i].count, test_cases[i].count, + base::UTF8ToUTF16("Title"), test_cases[i].count, test_cases[i].count, Time::Now(), false, history::SOURCE_BROWSED); } diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index a0e7d5f..81a9012 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -362,7 +362,7 @@ void KeywordProvider::Start(const AutocompleteInput& input, bool have_listeners = extensions::ExtensionOmniboxEventRouter::OnInputChanged( profile_, template_url->GetExtensionId(), - UTF16ToUTF8(remaining_input), current_input_id_); + base::UTF16ToUTF8(remaining_input), current_input_id_); // We only have to wait for suggest results if there are actually // extensions listening for input changes. @@ -590,10 +590,11 @@ void KeywordProvider::Observe(int type, // interaction. extension_suggest_matches_.push_back(CreateAutocompleteMatch( template_url, input, keyword.length(), - UTF8ToUTF16(suggestion.content), false, first_relevance - (i + 1))); + base::UTF8ToUTF16(suggestion.content), false, + first_relevance - (i + 1))); AutocompleteMatch* match = &extension_suggest_matches_.back(); - match->contents.assign(UTF8ToUTF16(suggestion.description)); + match->contents.assign(base::UTF8ToUTF16(suggestion.description)); match->contents_class = extensions::StyleTypesToACMatchClassifications(suggestion); match->description.clear(); diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc index e6b7ca0..e61fa3f 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -14,6 +14,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" +using base::ASCIIToUTF16; + class KeywordProviderTest : public testing::Test { protected: template<class ResultType> diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 7762b9e..db57dfb 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -427,7 +427,7 @@ AutocompleteMatch SearchProvider::CreateSearchSuggestion( // values preserve that property. Otherwise, if the user starts editing a // suggestion, non-Search results will suddenly appear. if (input.type() == AutocompleteInput::FORCED_QUERY) - match.fill_into_edit.assign(ASCIIToUTF16("?")); + match.fill_into_edit.assign(base::ASCIIToUTF16("?")); if (is_keyword) match.fill_into_edit.append(match.keyword + char16(' ')); if (!input.prevent_inline_autocomplete() && @@ -726,7 +726,7 @@ void SearchProvider::OnURLFetchComplete(const net::URLFetcher* source) { if (base::CodepageToUTF16(json_data, charset.c_str(), base::OnStringConversionError::FAIL, &data_16)) - json_data = UTF16ToUTF8(data_16); + json_data = base::UTF16ToUTF8(data_16); } } @@ -1173,7 +1173,8 @@ bool SearchProvider::ParseSuggestResults(base::Value* root_val, relevances = NULL; if (types && types->GetString(index, &type) && (type == "NAVIGATION")) { // Do not blindly trust the URL coming from the server to be valid. - GURL url(URLFixerUpper::FixupURL(UTF16ToUTF8(suggestion), std::string())); + GURL url(URLFixerUpper::FixupURL( + base::UTF16ToUTF8(suggestion), std::string())); if (url.is_valid() && allow_navsuggest) { base::string16 title; if (descriptions != NULL) @@ -1895,7 +1896,7 @@ AutocompleteMatch SearchProvider::NavigationToMatch( // Preserve the forced query '?' prefix in |match.fill_into_edit|. // Otherwise, user edits to a suggestion would show non-Search results. if (input_.type() == AutocompleteInput::FORCED_QUERY) { - match.fill_into_edit.insert(0, ASCIIToUTF16("?")); + match.fill_into_edit.insert(0, base::ASCIIToUTF16("?")); if (inline_autocomplete_offset != base::string16::npos) ++inline_autocomplete_offset; } diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 94964e7c..9d96424 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -45,6 +45,8 @@ #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" +using base::ASCIIToUTF16; + namespace { // Returns the first match in |matches| with |allowed_to_be_default_match| @@ -291,13 +293,16 @@ void SearchProviderTest::RunTest(TestData* cases, bool prefer_keyword) { ACMatches matches; for (int i = 0; i < num_cases; ++i) { - AutocompleteInput input(cases[i].input, base::string16::npos, base::string16(), GURL(), + AutocompleteInput input(cases[i].input, base::string16::npos, + base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, prefer_keyword, true, AutocompleteInput::ALL_MATCHES); provider_->Start(input, false); matches = provider_->matches(); - base::string16 diagnostic_details = ASCIIToUTF16("Input was: ") + cases[i].input + + base::string16 diagnostic_details = + ASCIIToUTF16("Input was: ") + + cases[i].input + ASCIIToUTF16("; prefer_keyword was: ") + (prefer_keyword ? ASCIIToUTF16("true") : ASCIIToUTF16("false")); EXPECT_EQ(cases[i].num_results, matches.size()) << diagnostic_details; @@ -3216,8 +3221,8 @@ TEST_F(SearchProviderTest, NavigationInlineDomainClassify) { QueryForInput(ASCIIToUTF16("w"), false, false); AutocompleteMatch match( provider_->NavigationToMatch(SearchProvider::NavigationResult( - *provider_.get(), GURL("http://www.wow.com"), base::string16(), false, 0, - false))); + *provider_.get(), GURL("http://www.wow.com"), base::string16(), false, + 0, false))); EXPECT_EQ(ASCIIToUTF16("ow.com"), match.inline_autocompletion); EXPECT_TRUE(match.allowed_to_be_default_match); EXPECT_EQ(ASCIIToUTF16("www.wow.com"), match.fill_into_edit); @@ -3392,9 +3397,9 @@ TEST_F(SearchProviderTest, RemoveStaleResultsTest) { } provider_->input_ = AutocompleteInput( - ASCIIToUTF16(cases[i].omnibox_input), base::string16::npos, base::string16(), - GURL(), AutocompleteInput::INVALID_SPEC, false, false, true, - AutocompleteInput::ALL_MATCHES); + ASCIIToUTF16(cases[i].omnibox_input), base::string16::npos, + base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, + true, AutocompleteInput::ALL_MATCHES); provider_->RemoveAllStaleResults(); // Check cached results. @@ -3501,13 +3506,13 @@ TEST_F(SearchProviderTest, ParseEntitySuggestion) { const Match& match = cases[i].matches[j]; SCOPED_TRACE(" and match index: " + base::IntToString(j)); EXPECT_EQ(match.contents, - UTF16ToUTF8(matches[j].contents)); + base::UTF16ToUTF8(matches[j].contents)); EXPECT_EQ(match.description, - UTF16ToUTF8(matches[j].description)); + base::UTF16ToUTF8(matches[j].description)); EXPECT_EQ(match.query_params, matches[j].search_terms_args->suggest_query_params); EXPECT_EQ(match.fill_into_edit, - UTF16ToUTF8(matches[j].fill_into_edit)); + base::UTF16ToUTF8(matches[j].fill_into_edit)); EXPECT_EQ(match.type, matches[j].type); } // Ensure that no expected matches are missing. @@ -3649,7 +3654,8 @@ TEST_F(SearchProviderTest, PrefetchMetadataParsing) { // Ensure that the returned matches equal the expectations. for (size_t j = 0; j < matches.size(); ++j) { SCOPED_TRACE(description); - EXPECT_EQ(cases[i].matches[j].contents, UTF16ToUTF8(matches[j].contents)); + EXPECT_EQ(cases[i].matches[j].contents, + base::UTF16ToUTF8(matches[j].contents)); EXPECT_EQ(cases[i].matches[j].allowed_to_be_prefetched, SearchProvider::ShouldPrefetch(matches[j])); EXPECT_EQ(cases[i].matches[j].type, matches[j].type); @@ -3680,7 +3686,7 @@ TEST_F(SearchProviderTest, XSSIGuardedJSONParsing_InvalidResponse) { // Should have exactly one "search what you typed" match ASSERT_TRUE(matches.size() == 1); - EXPECT_EQ(input_str, UTF16ToUTF8(matches[0].contents)); + EXPECT_EQ(input_str, base::UTF16ToUTF8(matches[0].contents)); EXPECT_EQ(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, matches[0].type); } @@ -3762,7 +3768,8 @@ TEST_F(SearchProviderTest, XSSIGuardedJSONParsing_ValidResponses) { // Ensure that the returned matches equal the expectations. for (; j < matches.size(); ++j) { SCOPED_TRACE("and match: " + base::IntToString(j)); - EXPECT_EQ(cases[i].matches[j].contents, UTF16ToUTF8(matches[j].contents)); + EXPECT_EQ(cases[i].matches[j].contents, + base::UTF16ToUTF8(matches[j].contents)); EXPECT_EQ(cases[i].matches[j].type, matches[j].type); } for (; j < ARRAYSIZE_UNSAFE(cases[i].matches); ++j) { @@ -3843,7 +3850,7 @@ TEST_F(SearchProviderTest, ParseDeletionUrl) { for (size_t j = 0; j < matches.size(); ++j) { const Match& match = cases[i].matches[j]; SCOPED_TRACE(" and match index: " + base::IntToString(j)); - EXPECT_EQ(match.contents, UTF16ToUTF8(matches[j].contents)); + EXPECT_EQ(match.contents, base::UTF16ToUTF8(matches[j].contents)); EXPECT_EQ(match.deletion_url, matches[j].GetAdditionalInfo( "deletion_url")); } diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc index c5d65ab..0c1a5f1 100644 --- a/chrome/browser/autocomplete/shortcuts_provider.cc +++ b/chrome/browser/autocomplete/shortcuts_provider.cc @@ -56,7 +56,8 @@ class DestinationURLEqualsURL { const URLPrefix* BestURLPrefixWithWWWCase( const base::string16& text, const base::string16& prefix_suffix) { - CR_DEFINE_STATIC_LOCAL(URLPrefix, www_prefix, (ASCIIToUTF16("www."), 1)); + CR_DEFINE_STATIC_LOCAL(URLPrefix, www_prefix, + (base::ASCIIToUTF16("www."), 1)); const URLPrefix* best_prefix = URLPrefix::BestURLPrefix(text, prefix_suffix); if ((best_prefix == NULL) || (best_prefix->num_components < www_prefix.num_components)) { @@ -220,7 +221,8 @@ AutocompleteMatch ShortcutsProvider::ShortcutToACMatch( DCHECK(match.destination_url.is_valid()); match.RecordAdditionalInfo("number of hits", shortcut.number_of_hits); match.RecordAdditionalInfo("last access time", shortcut.last_access_time); - match.RecordAdditionalInfo("original input text", UTF16ToUTF8(shortcut.text)); + match.RecordAdditionalInfo("original input text", + base::UTF16ToUTF8(shortcut.text)); // Set |inline_autocompletion| and |allowed_to_be_default_match| if possible. // If the match is a search query this is easy: simply check whether the diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc index 1c83527..71b1f69 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc @@ -37,6 +37,7 @@ #include "extensions/common/value_builder.h" #include "testing/gtest/include/gtest/gtest.h" +using base::ASCIIToUTF16; // TestShortcutInfo ----------------------------------------------------------- diff --git a/chrome/browser/autocomplete/url_prefix.cc b/chrome/browser/autocomplete/url_prefix.cc index 51a0c7c..b304c7c 100644 --- a/chrome/browser/autocomplete/url_prefix.cc +++ b/chrome/browser/autocomplete/url_prefix.cc @@ -17,13 +17,13 @@ URLPrefix::URLPrefix(const base::string16& prefix, size_t num_components) const URLPrefixes& URLPrefix::GetURLPrefixes() { CR_DEFINE_STATIC_LOCAL(URLPrefixes, prefixes, ()); if (prefixes.empty()) { - prefixes.push_back(URLPrefix(ASCIIToUTF16("https://www."), 2)); - prefixes.push_back(URLPrefix(ASCIIToUTF16("http://www."), 2)); - prefixes.push_back(URLPrefix(ASCIIToUTF16("ftp://ftp."), 2)); - prefixes.push_back(URLPrefix(ASCIIToUTF16("ftp://www."), 2)); - prefixes.push_back(URLPrefix(ASCIIToUTF16("https://"), 1)); - prefixes.push_back(URLPrefix(ASCIIToUTF16("http://"), 1)); - prefixes.push_back(URLPrefix(ASCIIToUTF16("ftp://"), 1)); + prefixes.push_back(URLPrefix(base::ASCIIToUTF16("https://www."), 2)); + prefixes.push_back(URLPrefix(base::ASCIIToUTF16("http://www."), 2)); + prefixes.push_back(URLPrefix(base::ASCIIToUTF16("ftp://ftp."), 2)); + prefixes.push_back(URLPrefix(base::ASCIIToUTF16("ftp://www."), 2)); + prefixes.push_back(URLPrefix(base::ASCIIToUTF16("https://"), 1)); + prefixes.push_back(URLPrefix(base::ASCIIToUTF16("http://"), 1)); + prefixes.push_back(URLPrefix(base::ASCIIToUTF16("ftp://"), 1)); prefixes.push_back(URLPrefix(base::string16(), 0)); } return prefixes; diff --git a/chrome/browser/autocomplete/zero_suggest_provider.cc b/chrome/browser/autocomplete/zero_suggest_provider.cc index f2fb93b..f29b0f1 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider.cc @@ -258,7 +258,8 @@ void ZeroSuggestProvider::FillResults( relevances = NULL; if (types && types->GetString(index, &type) && (type == "NAVIGATION")) { // Do not blindly trust the URL coming from the server to be valid. - GURL url(URLFixerUpper::FixupURL(UTF16ToUTF8(result), std::string())); + GURL url(URLFixerUpper::FixupURL( + base::UTF16ToUTF8(result), std::string())); if (url.is_valid()) { if (descriptions != NULL) descriptions->GetString(index, &title); diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 69156ad..d47a9f6 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -49,6 +49,9 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/keycodes/keyboard_codes.h" +using base::ASCIIToUTF16; +using base::WideToUTF16; + namespace autofill { class WindowedPersonalDataManagerObserver diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index 8591154..95a6217 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc @@ -53,6 +53,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/keycodes/keyboard_codes.h" +using base::ASCIIToUTF16; namespace autofill { @@ -1031,15 +1032,16 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, base::string16 street = ASCIIToUTF16( base::IntToString(base::RandInt(0, 10000)) + " " + streets[base::RandInt(0, streets.size() - 1)]); - base::string16 city = ASCIIToUTF16(cities[base::RandInt(0, cities.size() - 1)]); + base::string16 city = + ASCIIToUTF16(cities[base::RandInt(0, cities.size() - 1)]); base::string16 zip(base::IntToString16(base::RandInt(0, 10000))); profile.SetRawInfo(NAME_FIRST, name); profile.SetRawInfo(EMAIL_ADDRESS, email); profile.SetRawInfo(ADDRESS_HOME_LINE1, street); profile.SetRawInfo(ADDRESS_HOME_CITY, city); - profile.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA")); + profile.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA")); profile.SetRawInfo(ADDRESS_HOME_ZIP, zip); - profile.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"US")); + profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US")); profiles.push_back(profile); } SetProfiles(&profiles); diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index 731b4ab..335ea98 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc @@ -91,9 +91,9 @@ std::string FormStructureBrowserTest::FormStructuresToString( field_iter != (*iter)->end(); ++field_iter) { forms_string += (*field_iter)->Type().ToString(); - forms_string += " | " + UTF16ToUTF8((*field_iter)->name); - forms_string += " | " + UTF16ToUTF8((*field_iter)->label); - forms_string += " | " + UTF16ToUTF8((*field_iter)->value); + forms_string += " | " + base::UTF16ToUTF8((*field_iter)->name); + forms_string += " | " + base::UTF16ToUTF8((*field_iter)->label); + forms_string += " | " + base::UTF16ToUTF8((*field_iter)->value); forms_string += "\n"; } } diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 74139a1..d65f737 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -1015,7 +1015,7 @@ void TestingAutomationProvider::ExecuteJavascriptInRenderViewFrame( // this javascript execution. render_view_host->ExecuteJavascriptInWebFrame( frame_xpath, - UTF8ToUTF16("window.domAutomationController.setAutomationId(0);")); + base::ASCIIToUTF16("window.domAutomationController.setAutomationId(0);")); render_view_host->ExecuteJavascriptInWebFrame( frame_xpath, script); } @@ -1045,7 +1045,8 @@ void TestingAutomationProvider::OpenNewBrowserWindowWithNewProfile( ProfileManager* profile_manager = g_browser_process->profile_manager(); new BrowserOpenedWithNewProfileNotificationObserver(this, reply_message); profile_manager->CreateMultiProfileAsync( - base::string16(), base::string16(), ProfileManager::CreateCallback(), std::string()); + base::string16(), base::string16(), + ProfileManager::CreateCallback(), std::string()); } // Sample json input: { "command": "GetMultiProfileInfo" } @@ -2686,8 +2687,9 @@ void TestingAutomationProvider::GetSearchEngineInfo( for (TemplateURLService::TemplateURLVector::const_iterator it = template_urls.begin(); it != template_urls.end(); ++it) { base::DictionaryValue* search_engine = new base::DictionaryValue; - search_engine->SetString("short_name", UTF16ToUTF8((*it)->short_name())); - search_engine->SetString("keyword", UTF16ToUTF8((*it)->keyword())); + search_engine->SetString("short_name", + base::UTF16ToUTF8((*it)->short_name())); + search_engine->SetString("keyword", base::UTF16ToUTF8((*it)->keyword())); search_engine->SetBoolean("in_default_list", (*it)->ShowInDefaultList()); search_engine->SetBoolean("is_default", (*it) == url_model->GetDefaultSearchProvider()); @@ -2698,7 +2700,7 @@ void TestingAutomationProvider::GetSearchEngineInfo( search_engine->SetString("host", (*it)->url_ref().GetHost()); search_engine->SetString("path", (*it)->url_ref().GetPath()); search_engine->SetString("display_url", - UTF16ToUTF8((*it)->url_ref().DisplayURL())); + base::UTF16ToUTF8((*it)->url_ref().DisplayURL())); search_engines->Append(search_engine); } return_value->Set("search_engines", search_engines); @@ -2724,12 +2726,12 @@ void TestingAutomationProvider::AddOrEditSearchEngine( return; } std::string new_ref_url = TemplateURLRef::DisplayURLToURLRef( - UTF8ToUTF16(new_url)); + base::UTF8ToUTF16(new_url)); scoped_ptr<KeywordEditorController> controller( new KeywordEditorController(browser->profile())); if (args->GetString("keyword", &keyword)) { TemplateURL* template_url = - url_model->GetTemplateURLForKeyword(UTF8ToUTF16(keyword)); + url_model->GetTemplateURLForKeyword(base::UTF8ToUTF16(keyword)); if (template_url == NULL) { AutomationJSONReply(this, reply_message).SendError( "No match for keyword: " + keyword); @@ -2763,7 +2765,7 @@ void TestingAutomationProvider::PerformActionOnSearchEngine( return; } TemplateURL* template_url = - url_model->GetTemplateURLForKeyword(UTF8ToUTF16(keyword)); + url_model->GetTemplateURLForKeyword(base::UTF8ToUTF16(keyword)); if (template_url == NULL) { AutomationJSONReply(this, reply_message).SendError( "No match for keyword: " + keyword); @@ -4214,7 +4216,7 @@ void TestingAutomationProvider::GetAppModalDialogMessage( return; } base::DictionaryValue result_dict; - result_dict.SetString("message", UTF16ToUTF8(dialog->message_text())); + result_dict.SetString("message", base::UTF16ToUTF8(dialog->message_text())); reply.SendSuccess(&result_dict); } @@ -4236,7 +4238,7 @@ void TestingAutomationProvider::AcceptOrDismissAppModalDialog( if (accept) { std::string prompt_text; if (args->GetString("prompt_text", &prompt_text)) - dialog->SetOverridePromptText(UTF8ToUTF16(prompt_text)); + dialog->SetOverridePromptText(base::UTF8ToUTF16(prompt_text)); dialog->native_dialog()->AcceptAppModalDialog(); } else { dialog->native_dialog()->CancelAppModalDialog(); diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index bbe4139..e39d42f 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -473,8 +473,8 @@ void TestingAutomationProvider::ExecuteJavascriptInOOBEWebUI( webui_host->GetOobeUI()->web_ui()->GetWebContents(); new DomOperationMessageSender(this, reply_message, true); - ExecuteJavascriptInRenderViewFrame(ASCIIToUTF16(frame_xpath), - ASCIIToUTF16(javascript), + ExecuteJavascriptInRenderViewFrame(base::ASCIIToUTF16(frame_xpath), + base::ASCIIToUTF16(javascript), reply_message, web_contents->GetRenderViewHost()); } diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 3edf342..02eee9e 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -61,7 +61,7 @@ bool ExtensionNameComparator::operator()( const scoped_refptr<const Extension>& x, const scoped_refptr<const Extension>& y) { return l10n_util::StringComparator<base::string16>(collator_)( - UTF8ToUTF16(x->name()), UTF8ToUTF16(y->name())); + base::UTF8ToUTF16(x->name()), base::UTF8ToUTF16(y->name())); } // Background application representation, private to the @@ -317,7 +317,7 @@ bool BackgroundApplicationListModel::IsBackgroundApp( BackgroundContentsService* service = BackgroundContentsServiceFactory::GetForProfile(profile); - base::string16 app_id = ASCIIToUTF16(extension.id()); + base::string16 app_id = base::ASCIIToUTF16(extension.id()); // If we have an active or registered background contents for this app, then // it's a background app. This covers the cases where the app has created its // background contents, but it hasn't navigated yet, or the background |