chrome/browser/search_engines/template_url_unittest.cc - Issue 7558014: Add a URL param to indicate group selection in Instant field trial.

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: Thread safe handling of Profiles 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_service_unittest.cc ('K') | « chrome/browser/search_engines/template_url_service_unittest.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | chrome/browser/ui/search_engines/edit_search_engine_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..75256ed14328365b545e525d54f9bac332a9519f 100644

--- a/chrome/browser/search_engines/template_url_unittest.cc

+++ b/chrome/browser/search_engines/template_url_unittest.cc

@@ -9,6 +9,7 @@

#include "chrome/browser/rlz/rlz.h"

#include "chrome/browser/search_engines/search_terms_data.h"

#include "chrome/browser/search_engines/template_url.h"

+#include "chrome/test/base/testing_profile.h"

#include "chrome/test/testing_browser_process_test.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -52,6 +53,9 @@ class TemplateURLTest : public TestingBrowserProcessTest {

EXPECT_STREQ(base_suggest_url,

search_terms_data.GoogleBaseSuggestURLValue().c_str());

}

+ protected:

+ TestingProfile profile_;

};

TEST_F(TemplateURLTest, Defaults) {

@@ -88,7 +92,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(&profile_, t_url, value.terms,

Peter Kasting 2011/08/10 20:54:06 Again, these can all pass NULL as you don't care a

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ(value.output, result.spec());

@@ -100,7 +104,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(&profile_, t_url, ASCIIToUTF16("X"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ("http://foox/", result.spec());

@@ -111,7 +115,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(&profile_, t_url, ASCIIToUTF16("X"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ("http://foox10/", result.spec());

@@ -123,7 +127,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(&profile_, t_url, ASCIIToUTF16("X"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ("http://fooxxy/", result.spec());

@@ -134,7 +138,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(&profile_, t_url, ASCIIToUTF16("X"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ("http://fooxx1y2/", result.spec());

@@ -146,7 +150,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(&profile_, t_url, ASCIIToUTF16("X"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ("http://fooxxutf-8ya/", result.spec());

@@ -181,7 +185,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(&profile_, t_url, ASCIIToUTF16("X"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ("http://fooxutf-8axyb/", result.spec());

@@ -193,7 +197,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(&profile_, t_url, ASCIIToUTF16("X"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

ASSERT_EQ("http://fooxxutf-8yutf-8a/", result.spec());

@@ -341,8 +345,9 @@ 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"),

- TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

+ GURL result = GURL(ref.ReplaceSearchTerms(&profile_, turl,

+ ASCIIToUTF16("X"), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,

+ string16()));

EXPECT_TRUE(result.is_valid());

EXPECT_EQ(expected_result, result.spec());

}

@@ -369,7 +374,7 @@ 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,

+ GURL result = GURL(ref.ReplaceSearchTerms(&profile_, turl,

data[i].search_term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,

string16()));

EXPECT_TRUE(result.is_valid());

@@ -401,8 +406,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(&profile_, 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 +425,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(&profile_, t_url, L"x",

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

ASSERT_TRUE(result.is_valid());

std::string expected_url = "http://bar/?";