Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5939)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autocomplete/autocomplete_browsertest.cc

Issue 109013006: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/apps/web_view_interactive_browsertest.cc ('k') | chrome/browser/autocomplete/autocomplete_input.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_browsertest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index eb0a59fe4059321dc5efd54c2707d36f61da206b..321a48266665839921ee17080c5410e891ccdd28 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);
« no previous file with comments | « chrome/browser/apps/web_view_interactive_browsertest.cc ('k') | chrome/browser/autocomplete/autocomplete_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698