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

components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 14 matching lines @@
 #include "base/time/time.h"
 #include "components/image_fetcher/image_decoder.h"
 #include "components/image_fetcher/image_fetcher.h"
 #include "components/image_fetcher/image_fetcher_delegate.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/category_rankers/category_ranker.h"
 #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"
 #include "components/ntp_snippets/remote/remote_suggestion.h"
 #include "components/ntp_snippets/remote/remote_suggestions_database.h"
 #include "components/ntp_snippets/remote/remote_suggestions_fetcher.h"
 #include "components/ntp_snippets/remote/test_utils.h"
 #include "components/ntp_snippets/user_classifier.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
@@ skipping 39 matching lines @@
 MATCHER_P(IsCategory, id, "") {
   return arg.id() == static_cast<int>(id);
 }
 
 MATCHER_P(HasCode, code, "") {
   return arg.code == 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/"

[jkrcal, 2017/02/03 10:17:49]

Changed this to avoid warnings from
RemoteSuggestionsFetcher::UsesChromeContentSuggestionsAPI().

     "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";
 const char kSuggestionTitle[] = "Title";
 const char kSuggestionText[] = "Suggestion";
 const char kSuggestionSalientImage[] = "http://localhost/salient_image";
 const char kSuggestionPublisherName[] = "Foo News";
 const char kSuggestionAmpUrl[] = "http://localhost/amp";
 
 const char kSuggestionUrl2[] = "http://foo.com/bar";
@@ skipping 252 matching lines @@
   gfx::Image decoded_image_;
 };
 
 }  // namespace
 
 class RemoteSuggestionsProviderImplTest : public ::testing::Test {
  public:
   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),
+        fake_token_service_(nullptr),

[jkrcal, 2017/02/03 10:17:49]

Added to increase clarity that null token service is provided to the fetcher
(since we are not signed-in, it is not used and does not crash).

Update: This is silly. I will remove it completely and inline the nullptr in
another patch set.

         category_ranker_(base::MakeUnique<ConstantCategoryRanker>()),
         user_classifier_(/*pref_service=*/nullptr),
         suggestions_fetcher_(nullptr),
         image_fetcher_(nullptr),
         image_decoder_(nullptr),
         database_(nullptr) {
     RemoteSuggestionsProviderImpl::RegisterProfilePrefs(
         utils_.pref_service()->registry());
     RequestThrottler::RegisterProfilePrefs(utils_.pref_service()->registry());
 
@@ skipping 23 matching lines @@
     scoped_refptr<net::TestURLRequestContextGetter> request_context_getter =
         new net::TestURLRequestContextGetter(task_runner.get());
 
     utils_.ResetSigninManager();
     auto suggestions_fetcher = base::MakeUnique<RemoteSuggestionsFetcher>(
         utils_.fake_signin_manager(), fake_token_service_.get(),
         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");

[jkrcal, 2017/02/03 10:17:49]

I emulate the previous (not-signed-in) behaviour) by not being signed-in.

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

So the previous state was signed-in, but personalization turned off, so the
sign-in state didn't actually do anything? Awesome...

-
     auto image_fetcher = base::MakeUnique<NiceMock<MockImageFetcher>>();
 
     image_fetcher_ = image_fetcher.get();
     EXPECT_CALL(*image_fetcher, SetImageFetcherDelegate(_));
     auto image_decoder = base::MakeUnique<FakeImageDecoder>();
     image_decoder_ = image_decoder.get();
     EXPECT_FALSE(observer_);
     observer_ = base::MakeUnique<FakeContentSuggestionsProviderObserver>();
     auto database = base::MakeUnique<RemoteSuggestionsDatabase>(
         database_dir_.GetPath(), task_runner);
@@ skipping 1385 matching lines @@
                          RemoteSuggestionsProvider::ProviderStatus)>::Call,
                      base::Unretained(&status_callback))));
 
   // Should be called when becoming disabled.
   EXPECT_CALL(status_callback,
               Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE));
   service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED);
 }
 
 }  // namespace ntp_snippets