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 "base/base_paths.h" | 5 #include "base/base_paths.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 "http://www.google.com/?foo&" }, | 558 "http://www.google.com/?foo&" }, |
559 { ASCIIToUTF16("foo"), | 559 { ASCIIToUTF16("foo"), |
560 2, | 560 2, |
561 "{google:baseURL}?{searchTerms}&{google:cursorPosition}", | 561 "{google:baseURL}?{searchTerms}&{google:cursorPosition}", |
562 "http://www.google.com/?foo&cp=2&" }, | 562 "http://www.google.com/?foo&cp=2&" }, |
563 { ASCIIToUTF16("foo"), | 563 { ASCIIToUTF16("foo"), |
564 15, | 564 15, |
565 "{google:baseURL}?{searchTerms}&{google:cursorPosition}", | 565 "{google:baseURL}?{searchTerms}&{google:cursorPosition}", |
566 "http://www.google.com/?foo&cp=15&" }, | 566 "http://www.google.com/?foo&cp=15&" }, |
567 }; | 567 }; |
| 568 UIThreadSearchTermsData::SetGoogleBaseURL("http://www.google.com/"); |
568 TemplateURLData data; | 569 TemplateURLData data; |
569 data.input_encodings.push_back("UTF-8"); | 570 data.input_encodings.push_back("UTF-8"); |
570 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { | 571 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { |
571 data.SetURL(test_data[i].url); | 572 data.SetURL(test_data[i].url); |
572 TemplateURL url(NULL, data); | 573 TemplateURL url(NULL, data); |
573 EXPECT_TRUE(url.url_ref().IsValid()); | 574 EXPECT_TRUE(url.url_ref().IsValid()); |
574 ASSERT_TRUE(url.url_ref().SupportsReplacement()); | 575 ASSERT_TRUE(url.url_ref().SupportsReplacement()); |
575 TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term); | 576 TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term); |
576 search_terms_args.cursor_position = test_data[i].cursor_position; | 577 search_terms_args.cursor_position = test_data[i].cursor_position; |
577 GURL result(url.url_ref().ReplaceSearchTerms(search_terms_args)); | 578 GURL result(url.url_ref().ReplaceSearchTerms(search_terms_args)); |
(...skipping 16 matching lines...) Expand all Loading... |
594 "http://www.google.com/?foo&url=http%3A%2F%2Fwww.google.com%2F&" }, | 595 "http://www.google.com/?foo&url=http%3A%2F%2Fwww.google.com%2F&" }, |
595 { ASCIIToUTF16("foo"), | 596 { ASCIIToUTF16("foo"), |
596 "", | 597 "", |
597 "{google:baseURL}?{searchTerms}&{google:currentPageUrl}", | 598 "{google:baseURL}?{searchTerms}&{google:currentPageUrl}", |
598 "http://www.google.com/?foo&" }, | 599 "http://www.google.com/?foo&" }, |
599 { ASCIIToUTF16("foo"), | 600 { ASCIIToUTF16("foo"), |
600 "http://g.com/+-/*&=", | 601 "http://g.com/+-/*&=", |
601 "{google:baseURL}?{searchTerms}&{google:currentPageUrl}", | 602 "{google:baseURL}?{searchTerms}&{google:currentPageUrl}", |
602 "http://www.google.com/?foo&url=http%3A%2F%2Fg.com%2F%2B-%2F*%26%3D&" }, | 603 "http://www.google.com/?foo&url=http%3A%2F%2Fg.com%2F%2B-%2F*%26%3D&" }, |
603 }; | 604 }; |
| 605 UIThreadSearchTermsData::SetGoogleBaseURL("http://www.google.com/"); |
604 TemplateURLData data; | 606 TemplateURLData data; |
605 data.input_encodings.push_back("UTF-8"); | 607 data.input_encodings.push_back("UTF-8"); |
606 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { | 608 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) { |
607 data.SetURL(test_data[i].url); | 609 data.SetURL(test_data[i].url); |
608 TemplateURL url(NULL, data); | 610 TemplateURL url(NULL, data); |
609 EXPECT_TRUE(url.url_ref().IsValid()); | 611 EXPECT_TRUE(url.url_ref().IsValid()); |
610 ASSERT_TRUE(url.url_ref().SupportsReplacement()); | 612 ASSERT_TRUE(url.url_ref().SupportsReplacement()); |
611 TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term); | 613 TemplateURLRef::SearchTermsArgs search_terms_args(test_data[i].search_term); |
612 search_terms_args.current_page_url = test_data[i].current_page_url; | 614 search_terms_args.current_page_url = test_data[i].current_page_url; |
613 GURL result(url.url_ref().ReplaceSearchTerms(search_terms_args)); | 615 GURL result(url.url_ref().ReplaceSearchTerms(search_terms_args)); |
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1290 { "http://bar/newtab", false, }, | 1292 { "http://bar/newtab", false, }, |
1291 }; | 1293 }; |
1292 | 1294 |
1293 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_data); ++i) { | 1295 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_data); ++i) { |
1294 EXPECT_EQ(url_data[i].result, | 1296 EXPECT_EQ(url_data[i].result, |
1295 search_provider.IsSearchURL(GURL(url_data[i].url))); | 1297 search_provider.IsSearchURL(GURL(url_data[i].url))); |
1296 } | 1298 } |
1297 } | 1299 } |
1298 | 1300 |
1299 TEST_F(TemplateURLTest, ReflectsBookmarkBarPinned) { | 1301 TEST_F(TemplateURLTest, ReflectsBookmarkBarPinned) { |
| 1302 UIThreadSearchTermsData::SetGoogleBaseURL("http://www.google.com/"); |
1300 TemplateURLData data; | 1303 TemplateURLData data; |
1301 data.input_encodings.push_back("UTF-8"); | 1304 data.input_encodings.push_back("UTF-8"); |
1302 data.SetURL("{google:baseURL}?{google:bookmarkBarPinned}q={searchTerms}"); | 1305 data.SetURL("{google:baseURL}?{google:bookmarkBarPinned}q={searchTerms}"); |
1303 TemplateURL url(NULL, data); | 1306 TemplateURL url(NULL, data); |
1304 EXPECT_TRUE(url.url_ref().IsValid()); | 1307 EXPECT_TRUE(url.url_ref().IsValid()); |
1305 ASSERT_TRUE(url.url_ref().SupportsReplacement()); | 1308 ASSERT_TRUE(url.url_ref().SupportsReplacement()); |
1306 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo")); | 1309 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo")); |
1307 | 1310 |
1308 // Do not add the param when InstantExtended is suppressed on SRPs. | 1311 // Do not add the param when InstantExtended is suppressed on SRPs. |
1309 url.url_ref_.showing_search_terms_ = false; | 1312 url.url_ref_.showing_search_terms_ = false; |
1310 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args); | 1313 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args); |
1311 EXPECT_EQ("http://www.google.com/?q=foo", result); | 1314 EXPECT_EQ("http://www.google.com/?q=foo", result); |
1312 | 1315 |
1313 // Add the param when InstantExtended is not suppressed on SRPs. | 1316 // Add the param when InstantExtended is not suppressed on SRPs. |
1314 url.url_ref_.showing_search_terms_ = true; | 1317 url.url_ref_.showing_search_terms_ = true; |
1315 search_terms_args.bookmark_bar_pinned = false; | 1318 search_terms_args.bookmark_bar_pinned = false; |
1316 result = url.url_ref().ReplaceSearchTerms(search_terms_args); | 1319 result = url.url_ref().ReplaceSearchTerms(search_terms_args); |
1317 EXPECT_EQ("http://www.google.com/?bmbp=0&q=foo", result); | 1320 EXPECT_EQ("http://www.google.com/?bmbp=0&q=foo", result); |
1318 | 1321 |
1319 url.url_ref_.showing_search_terms_ = true; | 1322 url.url_ref_.showing_search_terms_ = true; |
1320 search_terms_args.bookmark_bar_pinned = true; | 1323 search_terms_args.bookmark_bar_pinned = true; |
1321 result = url.url_ref().ReplaceSearchTerms(search_terms_args); | 1324 result = url.url_ref().ReplaceSearchTerms(search_terms_args); |
1322 EXPECT_EQ("http://www.google.com/?bmbp=1&q=foo", result); | 1325 EXPECT_EQ("http://www.google.com/?bmbp=1&q=foo", result); |
1323 } | 1326 } |
OLD | NEW |