| OLD | NEW |
| 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 Loading... |
| 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(), false, false, true, | 229 AutocompleteInput input(text, string16::npos, string16(), false, false, true, |
| 230 AutocompleteInput::ALL_MATCHES); | 230 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 |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |