| Index: components/doodle/doodle_fetcher_impl_unittest.cc
|
| diff --git a/components/doodle/doodle_fetcher_impl_unittest.cc b/components/doodle/doodle_fetcher_impl_unittest.cc
|
| index 8835b10131f253e72443b12f51844b3e5d009823..b9908d42237f5c4ada5598ca7010dcc95697f04a 100644
|
| --- a/components/doodle/doodle_fetcher_impl_unittest.cc
|
| +++ b/components/doodle/doodle_fetcher_impl_unittest.cc
|
| @@ -34,7 +34,8 @@ namespace doodle {
|
|
|
| namespace {
|
|
|
| -const char kDoodleConfigPath[] = "/async/ddljson";
|
| +const char kDoodleConfigPath[] = "/async/ddljson?async=ntp:1,graybg:1";
|
| +const char kDoodleConfigPathNoGrayBg[] = "/async/ddljson?async=ntp:1,graybg:0";
|
|
|
| // Required to instantiate a GoogleUrlTracker in UNIT_TEST_MODE.
|
| class GoogleURLTrackerClientStub : public GoogleURLTrackerClient {
|
| @@ -67,15 +68,16 @@ void ParseJson(
|
|
|
| } // namespace
|
|
|
| -class DoodleFetcherImplTest : public testing::Test {
|
| +class DoodleFetcherImplTestBase : public testing::Test {
|
| public:
|
| - DoodleFetcherImplTest()
|
| + DoodleFetcherImplTestBase(bool gray_background)
|
| : google_url_tracker_(base::MakeUnique<GoogleURLTrackerClientStub>(),
|
| GoogleURLTracker::UNIT_TEST_MODE),
|
| doodle_fetcher_(
|
| new net::TestURLRequestContextGetter(message_loop_.task_runner()),
|
| &google_url_tracker_,
|
| - base::Bind(ParseJson)) {}
|
| + base::Bind(ParseJson),
|
| + gray_background) {}
|
|
|
| void RespondWithData(const std::string& data) {
|
| net::TestURLFetcher* url_fetcher = GetRunningFetcher();
|
| @@ -116,6 +118,12 @@ class DoodleFetcherImplTest : public testing::Test {
|
| DoodleFetcherImpl doodle_fetcher_;
|
| };
|
|
|
| +class DoodleFetcherImplTest : public DoodleFetcherImplTestBase {
|
| + public:
|
| + DoodleFetcherImplTest()
|
| + : DoodleFetcherImplTestBase(/*gray_background=*/true) {}
|
| +};
|
| +
|
| TEST_F(DoodleFetcherImplTest, ReturnsFromFetchWithoutError) {
|
| base::MockCallback<DoodleFetcherImpl::FinishedCallback> callback;
|
| doodle_fetcher()->FetchDoodle(callback.Get());
|
| @@ -423,7 +431,7 @@ TEST_F(DoodleFetcherImplTest, ReceivesBaseUrlFromTracker) {
|
| // Google base URL is the default anyway. Find a way to set the base URL in
|
| // the tracker.
|
| EXPECT_THAT(GetRunningFetcher()->GetOriginalURL(),
|
| - Eq(GetGoogleBaseURL().Resolve(kDoodleConfigPath)));
|
| + Eq(Resolve(kDoodleConfigPath)));
|
| }
|
|
|
| TEST_F(DoodleFetcherImplTest, OverridesBaseUrlWithCommandLineArgument) {
|
| @@ -437,4 +445,18 @@ TEST_F(DoodleFetcherImplTest, OverridesBaseUrlWithCommandLineArgument) {
|
| Eq(GURL("http://www.google.kz").Resolve(kDoodleConfigPath)));
|
| }
|
|
|
| +class DoodleFetcherImplNoGrayBgTest : public DoodleFetcherImplTestBase {
|
| + public:
|
| + DoodleFetcherImplNoGrayBgTest()
|
| + : DoodleFetcherImplTestBase(/*gray_background=*/false) {}
|
| +};
|
| +
|
| +TEST_F(DoodleFetcherImplNoGrayBgTest, PassesNoGrayBgParam) {
|
| + base::MockCallback<DoodleFetcherImpl::FinishedCallback> callback;
|
| + doodle_fetcher()->FetchDoodle(callback.Get());
|
| +
|
| + EXPECT_THAT(GetRunningFetcher()->GetOriginalURL(),
|
| + Eq(Resolve(kDoodleConfigPathNoGrayBg)));
|
| +}
|
| +
|
| } // namespace doodle
|
|
|