[Remote suggestions] Clean up variation params in the fetcher.

components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc

Index: components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc
diff --git a/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc b/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc
index 84b83172c3c06ff8e2c1023bb16acc941e47b934..84349c862695b8acc838a367cc09420ede36a22a 100644
--- a/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc
+++ b/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc
@@ -32,6 +32,7 @@
 #include "components/ntp_snippets/category_rankers/constant_category_ranker.h"
 #include "components/ntp_snippets/category_rankers/mock_category_ranker.h"
 #include "components/ntp_snippets/fake_content_suggestions_provider_observer.h"
+#include "components/ntp_snippets/features.h"
 #include "components/ntp_snippets/ntp_snippets_constants.h"
 #include "components/ntp_snippets/pref_names.h"
 #include "components/ntp_snippets/remote/persistent_scheduler.h"
@@ -91,11 +92,11 @@ MATCHER_P(HasCode, code, "") {
 
 const base::Time::Exploded kDefaultCreationTime = {2015, 11, 4, 25, 13, 46, 45};
 const char kTestContentSuggestionsServerEndpoint[] =
-    "https://localunittest-chromecontentsuggestions-pa.googleapis.com/v1/"
+    "https://alpha-chromecontentsuggestions-pa.sandbox.googleapis.com/v1/"
     "suggestions/fetch";
 const char kAPIKey[] = "fakeAPIkey";
 const char kTestContentSuggestionsServerWithAPIKey[] =
-    "https://localunittest-chromecontentsuggestions-pa.googleapis.com/v1/"
+    "https://alpha-chromecontentsuggestions-pa.sandbox.googleapis.com/v1/"
     "suggestions/fetch?key=fakeAPIkey";
 
 const char kSuggestionUrl[] = "http://localhost/foobar";
@@ -368,8 +369,8 @@ class RemoteSuggestionsProviderImplTest : public ::testing::Test {
   RemoteSuggestionsProviderImplTest()
       : params_manager_(ntp_snippets::kStudyName,
                         {{"content_suggestions_backend",
-                          kTestContentSuggestionsServerEndpoint},
-                         {"fetching_personalization", "non_personal"}}),
+                          kTestContentSuggestionsServerEndpoint}},
+                        {ntp_snippets::kArticleSuggestionsFeature.name}),
         fake_url_fetcher_factory_(
             /*default_factory=*/&failing_url_fetcher_factory_),
         test_url_(kTestContentSuggestionsServerWithAPIKey),
@@ -411,13 +412,11 @@ class RemoteSuggestionsProviderImplTest : public ::testing::Test {
 
     utils_.ResetSigninManager();
     auto suggestions_fetcher = base::MakeUnique<RemoteSuggestionsFetcher>(
-        utils_.fake_signin_manager(), fake_token_service_.get(),
+        utils_.fake_signin_manager(), /*token_service=*/nullptr,

[Marc Treib, 2017/02/03 10:52:08]

Does this work without any "may be null in tests" in the fetcher?!
I guess due to the non-signed-in state, the fetcher never actually does anything
with the service?

I suppose this is okay for now (this CL doesn't make the situation any worse),
but we really should add tests for this. Did we have a bug already? Either way,
we should at least add a TODO, also to document the current state.

[jkrcal, 2017/02/03 11:04:16]

I think the tests belong to the fetcher_unittest. Added a TODO there.

[Marc Treib, 2017/02/03 11:10:46]

That makes sense! We have a separate TODO on the Fetcher class to make it an
interface, so that we could inject a fake fetcher here.

         std::move(request_context_getter), utils_.pref_service(), nullptr,
         base::Bind(&ParseJson), kAPIKey, &user_classifier_);
     suggestions_fetcher_ = suggestions_fetcher.get();
 
-    utils_.fake_signin_manager()->SignIn("foo@bar.com");
-
     auto image_fetcher = base::MakeUnique<NiceMock<MockImageFetcher>>();
 
     image_fetcher_ = image_fetcher.get();
@@ -539,7 +538,6 @@ class RemoteSuggestionsProviderImplTest : public ::testing::Test {
   // Instantiation of factory automatically sets itself as URLFetcher's factory.
   net::FakeURLFetcherFactory fake_url_fetcher_factory_;
   const GURL test_url_;
-  std::unique_ptr<OAuth2TokenService> fake_token_service_;
   std::unique_ptr<CategoryRanker> category_ranker_;
   UserClassifier user_classifier_;
   std::unique_ptr<FakeContentSuggestionsProviderObserver> observer_;