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

Side by Side Diff: chrome/browser/autocomplete/shortcuts_provider_unittest.cc

Issue 12623029: Upstreaming mechanism to add query refinement to omnibox searches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed ChromeOS. Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/autocomplete/shortcuts_provider.h" 5 #include "chrome/browser/autocomplete/shortcuts_provider.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <functional> 10 #include <functional>
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 const std::string& expected) { 219 const std::string& expected) {
220 EXPECT_EQ(1U, matches_.erase(expected)); 220 EXPECT_EQ(1U, matches_.erase(expected));
221 } 221 }
222 222
223 void ShortcutsProviderTest::RunTest(const string16 text, 223 void ShortcutsProviderTest::RunTest(const string16 text,
224 std::vector<std::string> expected_urls, 224 std::vector<std::string> expected_urls,
225 std::string expected_top_result) { 225 std::string expected_top_result) {
226 std::sort(expected_urls.begin(), expected_urls.end()); 226 std::sort(expected_urls.begin(), expected_urls.end());
227 227
228 MessageLoop::current()->RunUntilIdle(); 228 MessageLoop::current()->RunUntilIdle();
229 AutocompleteInput input(text, string16::npos, string16(), false, false, true, 229 AutocompleteInput input(text, string16::npos, string16(), GURL(), false,
230 AutocompleteInput::ALL_MATCHES); 230 false, true, AutocompleteInput::ALL_MATCHES);
231 provider_->Start(input, false); 231 provider_->Start(input, false);
232 EXPECT_TRUE(provider_->done()); 232 EXPECT_TRUE(provider_->done());
233 233
234 ac_matches_ = provider_->matches(); 234 ac_matches_ = provider_->matches();
235 235
236 // We should have gotten back at most AutocompleteProvider::kMaxMatches. 236 // We should have gotten back at most AutocompleteProvider::kMaxMatches.
237 EXPECT_LE(ac_matches_.size(), AutocompleteProvider::kMaxMatches); 237 EXPECT_LE(ac_matches_.size(), AutocompleteProvider::kMaxMatches);
238 238
239 // If the number of expected and actual matches aren't equal then we need 239 // If the number of expected and actual matches aren't equal then we need
240 // test no further, but let's do anyway so that we know which URLs failed. 240 // test no further, but let's do anyway so that we know which URLs failed.
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 664
665 match.destination_url = GURL(shortcuts_to_test_delete[2].url); 665 match.destination_url = GURL(shortcuts_to_test_delete[2].url);
666 match.contents = ASCIIToUTF16(shortcuts_to_test_delete[2].contents); 666 match.contents = ASCIIToUTF16(shortcuts_to_test_delete[2].contents);
667 match.description = ASCIIToUTF16(shortcuts_to_test_delete[2].description); 667 match.description = ASCIIToUTF16(shortcuts_to_test_delete[2].description);
668 668
669 provider_->DeleteMatch(match); 669 provider_->DeleteMatch(match);
670 EXPECT_EQ(original_shortcuts_count, backend_->shortcuts_map().size()); 670 EXPECT_EQ(original_shortcuts_count, backend_->shortcuts_map().size());
671 EXPECT_TRUE(backend_->shortcuts_map().end() == 671 EXPECT_TRUE(backend_->shortcuts_map().end() ==
672 backend_->shortcuts_map().find(ASCIIToUTF16("delete"))); 672 backend_->shortcuts_map().find(ASCIIToUTF16("delete")));
673 } 673 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698