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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7558014: Add a URL param to indicate group selection in Instant field trial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Passing NULL as far as possible Created 9 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
« chrome/browser/search_engines/template_url.h ('K') | « chrome/browser/search_engines/template_url_service_unittest.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ab6090c8779b3cd5033015abf83ec477c6c047c9..d7fc441cd08f38948a0e19654d782efe13cf98c0 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -88,7 +88,7 @@ TEST_F(TemplateURLTest, URLRefTestSearchTerms) {
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, value.terms,
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, value.terms,
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ(value.output, result.spec());
@@ -100,7 +100,7 @@ TEST_F(TemplateURLTest, URLRefTestCount) {
TemplateURLRef ref("http://foo{searchTerms}{count?}", 0, 0);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ("http://foox/", result.spec());
@@ -111,7 +111,7 @@ TEST_F(TemplateURLTest, URLRefTestCount2) {
TemplateURLRef ref("http://foo{searchTerms}{count}", 0, 0);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ("http://foox10/", result.spec());
@@ -123,7 +123,7 @@ TEST_F(TemplateURLTest, URLRefTestIndices) {
1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ("http://fooxxy/", result.spec());
@@ -134,7 +134,7 @@ TEST_F(TemplateURLTest, URLRefTestIndices2) {
TemplateURLRef ref("http://foo{searchTerms}x{startIndex}y{startPage}", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ("http://fooxx1y2/", result.spec());
@@ -146,7 +146,7 @@ TEST_F(TemplateURLTest, URLRefTestEncoding) {
"http://foo{searchTerms}x{inputEncoding?}y{outputEncoding?}a", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ("http://fooxxutf-8ya/", result.spec());
@@ -181,7 +181,7 @@ TEST_F(TemplateURLTest, InputEncodingBeforeSearchTerm) {
"http://foox{inputEncoding?}a{searchTerms}y{outputEncoding?}b", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ("http://fooxutf-8axyb/", result.spec());
@@ -193,7 +193,7 @@ TEST_F(TemplateURLTest, URLRefTestEncoding2) {
"http://foo{searchTerms}x{inputEncoding}y{outputEncoding}a", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
ASSERT_EQ("http://fooxxutf-8yutf-8a/", result.spec());
@@ -341,7 +341,7 @@ TEST_F(TemplateURLTest, ReplaceSearchTerms) {
std::string expected_result = data[i].expected_result;
ReplaceSubstringsAfterOffset(&expected_result, 0, "{language}",
g_browser_process->GetApplicationLocale());
- GURL result = GURL(ref.ReplaceSearchTerms(turl, ASCIIToUTF16("X"),
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, turl, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
EXPECT_TRUE(result.is_valid());
EXPECT_EQ(expected_result, result.spec());
@@ -369,9 +369,8 @@ TEST_F(TemplateURLTest, ReplaceArbitrarySearchTerms) {
TemplateURL turl;
turl.add_input_encoding(data[i].encoding);
TemplateURLRef ref(data[i].url, 1, 2);
- GURL result = GURL(ref.ReplaceSearchTerms(turl,
- data[i].search_term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
- string16()));
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, turl, data[i].search_term,
+ TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
EXPECT_TRUE(result.is_valid());
EXPECT_EQ(data[i].expected_result, result.spec());
}
@@ -401,8 +400,9 @@ TEST_F(TemplateURLTest, Suggestions) {
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
- GURL result = GURL(ref.ReplaceSearchTerms(turl, ASCIIToUTF16("foobar"),
- data[i].accepted_suggestion, data[i].original_query_for_suggestion));
+ GURL result = GURL(ref.ReplaceSearchTerms(NULL, turl,
+ ASCIIToUTF16("foobar"), data[i].accepted_suggestion,
+ data[i].original_query_for_suggestion));
EXPECT_TRUE(result.is_valid());
EXPECT_EQ(data[i].expected_result, result.spec());
}
@@ -419,7 +419,7 @@ TEST_F(TemplateURLTest, RLZ) {
TemplateURLRef ref("http://bar/?{google:RLZ}{searchTerms}", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result(ref.ReplaceSearchTerms(t_url, L"x",
+ GURL result(ref.ReplaceSearchTerms(NULL, t_url, L"x",
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
std::string expected_url = "http://bar/?";
« chrome/browser/search_engines/template_url.h ('K') | « chrome/browser/search_engines/template_url_service_unittest.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698