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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 5774004: Make HistoryContentsProvider results deletable (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Move DeleteMatch to common base class, update includes, etc. Created 10 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 | « no previous file | chrome/browser/autocomplete/autocomplete_match.h » ('j') | chrome/browser/autocomplete/history_provider.h » ('J')
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 7036ed53d70124bca5d04b562f4ec1b89136bff0..1d695d2609d333e5c4c6a808bbc1adc189fbc316 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -61,7 +61,7 @@ class AutocompleteBrowserTest : public InProcessBrowserTest {
IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
LocationBar* location_bar = GetLocationBar();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
// TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
@@ -69,20 +69,20 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
location_bar->FocusLocation(true);
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_TRUE(location_bar->location_entry()->IsSelectAll());
location_bar->location_entry()->SetUserText(L"chrome");
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"chrome", location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
location_bar->location_entry()->RevertAll();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
@@ -90,7 +90,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
location_bar->location_entry()->SetUserText(L"chrome");
location_bar->Revert();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
@@ -109,8 +109,8 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
true, false, true, true);
EXPECT_TRUE(autocomplete_controller->done());
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
- EXPECT_EQ(std::wstring(), location_bar->location_entry()->GetText());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
+ EXPECT_TRUE(location_bar->location_entry()->GetText().empty());
EXPECT_TRUE(location_bar->location_entry()->IsSelectAll());
const AutocompleteResult& result = autocomplete_controller->result();
ASSERT_EQ(1U, result.size()) << AutocompleteResultAsString(result);
@@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
{
location_bar->Revert();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
@@ -156,12 +156,12 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
// Focus search when omnibox is blank
{
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL),
location_bar->location_entry()->GetText());
location_bar->FocusSearch();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
@@ -174,11 +174,11 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
// Focus search when omnibox is _not_ alread in forced query mode.
{
location_bar->location_entry()->SetUserText(L"foo");
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"foo", location_bar->location_entry()->GetText());
location_bar->FocusSearch();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
@@ -192,11 +192,11 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
// has been typed.
{
location_bar->location_entry()->SetUserText(L"?");
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
location_bar->FocusSearch();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"?", location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
@@ -210,11 +210,11 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
// has been typed.
{
location_bar->location_entry()->SetUserText(L"?foo");
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"?foo", location_bar->location_entry()->GetText());
location_bar->FocusSearch();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L"?foo", location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
@@ -227,11 +227,11 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
// Focus search when omnibox is in forced query mode with leading whitespace.
{
location_bar->location_entry()->SetUserText(L" ?foo");
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L" ?foo", location_bar->location_entry()->GetText());
location_bar->FocusSearch();
- EXPECT_EQ(std::wstring(), location_bar->GetInputString());
+ EXPECT_TRUE(location_bar->GetInputString().empty());
EXPECT_EQ(L" ?foo", location_bar->location_entry()->GetText());
size_t selection_start, selection_end;
« no previous file with comments | « no previous file | chrome/browser/autocomplete/autocomplete_match.h » ('j') | chrome/browser/autocomplete/history_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698