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

Unified Diff: chrome/browser/search_engines/template_url_unittest.cc

Issue 22945004: InstantExtended: Add new_tab_url to TemplateURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search_engines/template_url_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index 708da7e4dc1d9438df8bd74d4c8e6a2986b5c0a2..ecd3ace803bfd8830e235bc5e1312292342981c8 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -38,7 +38,7 @@ class TestSearchTermsData : public SearchTermsData {
};
TestSearchTermsData::TestSearchTermsData(const std::string& google_base_url)
- : google_base_url_(google_base_url) {
+ : google_base_url_(google_base_url) {
}
std::string TestSearchTermsData::GoogleBaseURLValue() const {
@@ -884,6 +884,14 @@ TEST_F(TemplateURLTest, GetURLOnlyOneURL) {
EXPECT_EQ("http://www.google.co.uk/", url.GetURL(0));
}
+TEST_F(TemplateURLTest, GetURLWithNewTabURL) {
+ TemplateURLData data;
+ data.SetURL("http://google.com/?q={searchTerms}");
+ data.new_tab_url = "http://google.com/newtab";
+ TemplateURL url(NULL, data);
+ EXPECT_EQ("http://google.com/newtab", url.new_tab_url());
+}
+
TEST_F(TemplateURLTest, ExtractSearchTermsFromURL) {
TemplateURLData data;
data.SetURL("http://google.com/?q={searchTerms}");
@@ -1197,6 +1205,7 @@ TEST_F(TemplateURLTest, IsSearchResults) {
TemplateURLData data;
data.SetURL("http://bar/search?q={searchTerms}");
data.instant_url = "http://bar/instant#q={searchTerms}";
+ data.new_tab_url = "http://bar/newtab";
data.alternate_urls.push_back("http://bar/?q={searchTerms}");
data.alternate_urls.push_back("http://bar/#q={searchTerms}");
data.alternate_urls.push_back("http://bar/search#q{searchTerms}");
@@ -1216,6 +1225,7 @@ TEST_F(TemplateURLTest, IsSearchResults) {
{ "http://bar/url?url=http://www.foo.com/&q=foo#ref=bar", false, },
{ "http://bar/", false, },
{ "http://foo/", false, },
+ { "http://bar/newtab", false, },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_data); ++i) {

Powered by Google App Engine
This is Rietveld 408576698