| Index: components/search_provider_logos/logo_tracker_unittest.cc
|
| diff --git a/components/search_provider_logos/logo_tracker_unittest.cc b/components/search_provider_logos/logo_tracker_unittest.cc
|
| index 528cfecc4441405f90535bf53c8db44670d2956a..d4420c6ff98806918fb6112a2ce2cfa43afdfe1d 100644
|
| --- a/components/search_provider_logos/logo_tracker_unittest.cc
|
| +++ b/components/search_provider_logos/logo_tracker_unittest.cc
|
| @@ -329,6 +329,7 @@ class LogoTrackerTest : public ::testing::Test {
|
| std::unique_ptr<LogoDelegate>(new TestLogoDelegate()));
|
| logo_tracker_->SetServerAPI(logo_url_, base::Bind(&GoogleParseLogoResponse),
|
| base::Bind(&GoogleAppendQueryparamsToLogoURL),
|
| + false,
|
| false);
|
| logo_tracker_->SetClockForTests(std::unique_ptr<base::Clock>(test_clock_));
|
| logo_tracker_->SetLogoCacheForTests(
|
| @@ -395,7 +396,7 @@ void LogoTrackerTest::SetServerResponseWhenFingerprint(
|
| net::URLRequestStatus::Status request_status,
|
| net::HttpStatusCode response_code) {
|
| GURL url_with_fp =
|
| - GoogleAppendQueryparamsToLogoURL(logo_url_, fingerprint, false);
|
| + GoogleAppendQueryparamsToLogoURL(logo_url_, fingerprint, false, false);
|
| fake_url_fetcher_factory_.SetFakeResponse(
|
| url_with_fp, response_when_fingerprint, response_code, request_status);
|
| }
|
| @@ -409,25 +410,36 @@ void LogoTrackerTest::GetLogo() {
|
|
|
| TEST_F(LogoTrackerTest, FingerprintURLHasColon) {
|
| GURL url_with_fp = GoogleAppendQueryparamsToLogoURL(
|
| - GURL("http://logourl.com/path"), "abc123", false);
|
| + GURL("http://logourl.com/path"), "abc123", false, false);
|
| EXPECT_EQ("http://logourl.com/path?async=es_dfp:abc123", url_with_fp.spec());
|
|
|
| url_with_fp = GoogleAppendQueryparamsToLogoURL(
|
| - GURL("http://logourl.com/?a=b"), "cafe0", false);
|
| + GURL("http://logourl.com/?a=b"), "cafe0", false, false);
|
| EXPECT_EQ("http://logourl.com/?a=b&async=es_dfp:cafe0", url_with_fp.spec());
|
| }
|
|
|
| TEST_F(LogoTrackerTest, CTAURLHasComma) {
|
| GURL url_with_fp = GoogleAppendQueryparamsToLogoURL(
|
| - GURL("http://logourl.com/path"), "abc123", true);
|
| + GURL("http://logourl.com/path"), "abc123", true, false);
|
| EXPECT_EQ("http://logourl.com/path?async=es_dfp:abc123,cta:1",
|
| url_with_fp.spec());
|
|
|
| url_with_fp = GoogleAppendQueryparamsToLogoURL(
|
| - GURL("http://logourl.com/?a=b"), "", true);
|
| + GURL("http://logourl.com/?a=b"), "", true, false);
|
| EXPECT_EQ("http://logourl.com/?a=b&async=cta:1", url_with_fp.spec());
|
| }
|
|
|
| +TEST_F(LogoTrackerTest, CTATransparentHasCommas) {
|
| + GURL url_with_fp = GoogleAppendQueryparamsToLogoURL(
|
| + GURL("http://logourl.com/path"), "abc123", true, true);
|
| + EXPECT_EQ("http://logourl.com/path?async=es_dfp:abc123,cta:1,transp:1",
|
| + url_with_fp.spec());
|
| +
|
| + url_with_fp = GoogleAppendQueryparamsToLogoURL(
|
| + GURL("http://logourl.com/?a=b"), "", true, true);
|
| + EXPECT_EQ("http://logourl.com/?a=b&async=cta:1,transp:1", url_with_fp.spec());
|
| +}
|
| +
|
| TEST_F(LogoTrackerTest, DownloadAndCacheLogo) {
|
| Logo logo = GetSampleLogo(logo_url_, test_clock_->Now());
|
| SetServerResponse(ServerResponse(logo));
|
| @@ -732,6 +744,7 @@ TEST_F(LogoTrackerTest, DeleteObserversWhenLogoURLChanged) {
|
| logo_url_ = GURL("http://example.com/new-logo-url");
|
| logo_tracker_->SetServerAPI(logo_url_, base::Bind(&GoogleParseLogoResponse),
|
| base::Bind(&GoogleAppendQueryparamsToLogoURL),
|
| + false,
|
| false);
|
| Logo logo = GetSampleLogo(logo_url_, test_clock_->Now());
|
| SetServerResponse(ServerResponse(logo));
|
|
|