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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 6306011: Remove wstring from autocomplete. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months 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/autocomplete/autocomplete_accessibility.cc ('k') | chrome/browser/autocomplete/autocomplete_classifier.h » ('j') | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_browsertest.cc
===================================================================
--- chrome/browser/autocomplete/autocomplete_browsertest.cc (revision 72388)
+++ chrome/browser/autocomplete/autocomplete_browsertest.cc (working copy)
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/format_macros.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/autocomplete/autocomplete.h"
@@ -32,16 +33,16 @@
namespace {
-std::wstring AutocompleteResultAsString(const AutocompleteResult& result) {
- std::wstring output(StringPrintf(L"{%d} ", result.size()));
+string16 AutocompleteResultAsString(const AutocompleteResult& result) {
+ std::string output(base::StringPrintf("{%" PRIuS "} ", result.size()));
for (size_t i = 0; i < result.size(); ++i) {
AutocompleteMatch match = result.match_at(i);
- std::wstring provider_name(ASCIIToWide(match.provider->name()));
- output.append(StringPrintf(L"[\"%ls\" by \"%ls\"] ",
- match.contents.c_str(),
- provider_name.c_str()));
+ std::string provider_name = match.provider->name();
+ output.append(base::StringPrintf("[\"%s\" by \"%s\"] ",
+ UTF16ToUTF8(match.contents).c_str(),
+ provider_name.c_str()));
}
- return output;
+ return UTF8ToUTF16(output);
}
} // namespace
@@ -62,7 +63,7 @@
LocationBar* location_bar = GetLocationBar();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
// TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
// platforms.
@@ -70,28 +71,28 @@
location_bar->FocusLocation(true);
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_TRUE(location_bar->location_entry()->IsSelectAll());
- location_bar->location_entry()->SetUserText(L"chrome");
+ location_bar->location_entry()->SetUserText(ASCIIToUTF16("chrome"));
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"chrome", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("chrome"), location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
location_bar->location_entry()->RevertAll();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
- location_bar->location_entry()->SetUserText(L"chrome");
+ location_bar->location_entry()->SetUserText(ASCIIToUTF16("chrome"));
location_bar->Revert();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
}
@@ -105,7 +106,7 @@
AutocompleteController* autocomplete_controller = GetAutocompleteController();
{
- autocomplete_controller->Start(L"chrome", std::wstring(),
+ autocomplete_controller->Start(ASCIIToUTF16("chrome"), string16(),
true, false, true, true);
EXPECT_TRUE(autocomplete_controller->done());
@@ -123,7 +124,7 @@
location_bar->Revert();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
const AutocompleteResult& result = autocomplete_controller->result();
@@ -136,17 +137,17 @@
// Make sure that tabbing away from an empty omnibar causes a revert
// and select all.
LocationBar* location_bar = GetLocationBar();
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
- location_bar->location_entry()->SetUserText(L"");
+ location_bar->location_entry()->SetUserText(string16());
browser()->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL),
PageTransition::START_PAGE);
ui_test_utils::WaitForNavigation(
&browser()->GetSelectedTabContents()->controller());
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
browser()->CloseTab();
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_TRUE(location_bar->location_entry()->IsSelectAll());
}
@@ -157,12 +158,12 @@
// Focus search when omnibox is blank
{
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
+ EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
location_bar->FocusSearch();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("?"), location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
location_bar->location_entry()->GetSelectionBounds(&selection_start,
@@ -173,13 +174,13 @@
// Focus search when omnibox is _not_ alread in forced query mode.
{
- location_bar->location_entry()->SetUserText(L"foo");
+ location_bar->location_entry()->SetUserText(ASCIIToUTF16("foo"));
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"foo", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("foo"), location_bar->location_entry()->GetText());
location_bar->FocusSearch();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("?"), location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
location_bar->location_entry()->GetSelectionBounds(&selection_start,
@@ -191,13 +192,13 @@
// Focus search when omnibox _is_ already in forced query mode, but no query
// has been typed.
{
- location_bar->location_entry()->SetUserText(L"?");
+ location_bar->location_entry()->SetUserText(ASCIIToUTF16("?"));
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("?"), location_bar->location_entry()->GetText());
location_bar->FocusSearch();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("?"), location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
location_bar->location_entry()->GetSelectionBounds(&selection_start,
@@ -209,13 +210,13 @@
// Focus search when omnibox _is_ already in forced query mode, and some query
// has been typed.
{
- location_bar->location_entry()->SetUserText(L"?foo");
+ location_bar->location_entry()->SetUserText(ASCIIToUTF16("?foo"));
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"?foo", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("?foo"), location_bar->location_entry()->GetText());
location_bar->FocusSearch();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L"?foo", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16("?foo"), location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
location_bar->location_entry()->GetSelectionBounds(&selection_start,
@@ -226,13 +227,15 @@
// Focus search when omnibox is in forced query mode with leading whitespace.
{
- location_bar->location_entry()->SetUserText(L" ?foo");
+ location_bar->location_entry()->SetUserText(ASCIIToUTF16(" ?foo"));
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L" ?foo", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16(" ?foo"),
+ location_bar->location_entry()->GetText());
location_bar->FocusSearch();
EXPECT_TRUE(location_bar->GetInputString().empty());
- EXPECT_EQ(L" ?foo", location_bar->location_entry()->GetText());
+ EXPECT_EQ(ASCIIToUTF16(" ?foo"),
+ location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
location_bar->location_entry()->GetSelectionBounds(&selection_start,
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_accessibility.cc ('k') | chrome/browser/autocomplete/autocomplete_classifier.h » ('j') | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698