diff options
| author | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 19:33:35 +0000 |
|---|---|---|
| committer | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 19:33:35 +0000 |
| commit | a2770a7dc01cc54b5143b0d61d56407621031dd0 (patch) | |
| tree | 664eb8a8625d5134e6dc5b02e1fd615aea5b7270 /chrome/browser/autocomplete/autocomplete_result_unittest.cc | |
| parent | aa62afd7cd7d99a896f0e3b3ab4da77d03203d5c (diff) | |
| download | chromium_src-a2770a7dc01cc54b5143b0d61d56407621031dd0.zip chromium_src-a2770a7dc01cc54b5143b0d61d56407621031dd0.tar.gz chromium_src-a2770a7dc01cc54b5143b0d61d56407621031dd0.tar.bz2 | |
Omnibox: Retire AutocompleteInput::MatchesRequested
and replace it with a simple boolean: want_asynchronous_matches
The extra complexity of the enum wasn't being used.
TBR=mpcomplete
(for the changes to chrome/browser/extensions/api/omnibox/*, which incidentally only touch test files)
BUG=
Review URL: https://codereview.chromium.org/242493008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_result_unittest.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_result_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_result_unittest.cc b/chrome/browser/autocomplete/autocomplete_result_unittest.cc index e98653e..cee2750 100644 --- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc @@ -177,7 +177,7 @@ void AutocompleteResultTest::RunCopyOldMatchesTest( AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); ACMatches last_matches; PopulateAutocompleteMatches(last, last_size, &last_matches); @@ -213,7 +213,7 @@ TEST_F(AutocompleteResultTest, Swap) { AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); matches.push_back(match); r1.AppendMatches(matches); r1.SortAndCull(input, test_util_.profile()); @@ -296,7 +296,7 @@ TEST_F(AutocompleteResultTest, SortAndCullEmptyDestinationURLs) { AutocompleteInput input(base::string16(), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); result.SortAndCull(input, test_util_.profile()); // Of the two results with the same non-empty destination URL, the @@ -342,7 +342,7 @@ TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) { AutocompleteInput input(base::string16(), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); result.SortAndCull(input, test_util_.profile()); // We expect the 3rd and 4th results to be removed. @@ -394,7 +394,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDups) { AutocompleteInput input(base::string16(), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INVALID_SPEC, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); result.SortAndCull(input, test_util_.profile()); // Expect 3 unique results after SortAndCull(). @@ -448,7 +448,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDemotionsByType) { AutocompleteInput input(base::string16(), base::string16::npos, base::string16(), GURL(), AutocompleteInput::HOME_PAGE, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); result.SortAndCull(input, test_util_.profile()); // Check the new ordering. The history-title results should be omitted. @@ -493,7 +493,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDupsAndDemotionsByType) { AutocompleteInput input( base::string16(), base::string16::npos, base::string16(), GURL(), AutocompleteInput::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS, false, - false, false, AutocompleteInput::ALL_MATCHES); + false, false, true); result.SortAndCull(input, test_util_.profile()); // The NAVSUGGEST dup-url stay above search-url since the navsuggest @@ -531,7 +531,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) { AutocompleteInput input(base::string16(), base::string16::npos, base::string16(), GURL(), AutocompleteInput::HOME_PAGE, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); result.SortAndCull(input, test_util_.profile()); AssertResultMatches(result, data, 4); } @@ -547,7 +547,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) { AutocompleteInput input(base::string16(), base::string16::npos, base::string16(), GURL(), AutocompleteInput::HOME_PAGE, false, false, false, - AutocompleteInput::ALL_MATCHES); + true); result.SortAndCull(input, test_util_.profile()); ASSERT_EQ(4U, result.size()); EXPECT_EQ("http://c/", result.match_at(0)->destination_url.spec()); |