| 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 "components/omnibox/browser/scored_history_match.h" | 5 #include "components/omnibox/browser/scored_history_match.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 Make1Term("testsearch"), one_word_no_offset, | 305 Make1Term("testsearch"), one_word_no_offset, |
| 306 word_starts, false, template_url_service.get(), | 306 word_starts, false, template_url_service.get(), |
| 307 now); | 307 now); |
| 308 EXPECT_GT(scored_b.raw_score, 0); | 308 EXPECT_GT(scored_b.raw_score, 0); |
| 309 | 309 |
| 310 // Set up a default search engine associated with this URL. | 310 // Set up a default search engine associated with this URL. |
| 311 TemplateURLData data; | 311 TemplateURLData data; |
| 312 data.SetShortName(ASCIIToUTF16("TestEngine")); | 312 data.SetShortName(ASCIIToUTF16("TestEngine")); |
| 313 data.SetKeyword(ASCIIToUTF16("TestEngine")); | 313 data.SetKeyword(ASCIIToUTF16("TestEngine")); |
| 314 data.SetURL("http://testsearch.com/{searchTerms}"); | 314 data.SetURL("http://testsearch.com/{searchTerms}"); |
| 315 TemplateURL* template_url = new TemplateURL(data); | 315 TemplateURL* template_url = |
| 316 template_url_service->Add(template_url); | 316 template_url_service->Add(base::MakeUnique<TemplateURL>(data)); |
| 317 template_url_service->SetUserSelectedDefaultSearchProvider(template_url); | 317 template_url_service->SetUserSelectedDefaultSearchProvider(template_url); |
| 318 template_url_service->Load(); | 318 template_url_service->Load(); |
| 319 | 319 |
| 320 // The search results page should not be returned when typing a query. | 320 // The search results page should not be returned when typing a query. |
| 321 ScoredHistoryMatch scored_c(row, visits, ASCIIToUTF16("thequery"), | 321 ScoredHistoryMatch scored_c(row, visits, ASCIIToUTF16("thequery"), |
| 322 Make1Term("thequery"), one_word_no_offset, | 322 Make1Term("thequery"), one_word_no_offset, |
| 323 word_starts, false, template_url_service.get(), | 323 word_starts, false, template_url_service.get(), |
| 324 now); | 324 now); |
| 325 EXPECT_EQ(0, scored_c.raw_score); | 325 EXPECT_EQ(0, scored_c.raw_score); |
| 326 | 326 |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 | 654 |
| 655 EXPECT_TRUE( | 655 EXPECT_TRUE( |
| 656 ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str, &hqp_buckets)); | 656 ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str, &hqp_buckets)); |
| 657 EXPECT_THAT(hqp_buckets, ElementsAre(Pair(0.0, 400), Pair(1.5, 600), | 657 EXPECT_THAT(hqp_buckets, ElementsAre(Pair(0.0, 400), Pair(1.5, 600), |
| 658 Pair(12.0, 1300), Pair(20.0, 1399))); | 658 Pair(12.0, 1300), Pair(20.0, 1399))); |
| 659 // invalid string. | 659 // invalid string. |
| 660 buckets_str = "0.0,400,1.5,600"; | 660 buckets_str = "0.0,400,1.5,600"; |
| 661 EXPECT_FALSE( | 661 EXPECT_FALSE( |
| 662 ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str, &hqp_buckets)); | 662 ScoredHistoryMatch::GetHQPBucketsFromString(buckets_str, &hqp_buckets)); |
| 663 } | 663 } |
| OLD | NEW |