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

components/ntp_snippets/remote/json_request.h

 // Copyright 2016 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_REMOTE_JSON_REQUEST_H_
 #define COMPONENTS_NTP_SNIPPETS_REMOTE_JSON_REQUEST_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "components/ntp_snippets/remote/request_params.h"
 #include "components/ntp_snippets/status.h"
 #include "components/translate/core/browser/language_model.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/http/http_request_headers.h"
 
 namespace base {
 class Value;
 class TickClock;
 }  // namespace base
 
 class FetchAPI;
-class Personalization;
 
 namespace ntp_snippets {
 class UserClassifier;
 
 namespace internal {
 
 // Enumeration listing all possible outcomes for fetch attempts. Used for UMA
 // histograms, so do not change existing values. Insert new values at the end,
 // and update the histogram definition.
 enum class FetchResult {
@@ skipping 37 matching lines @@
 
     Builder& SetAuthentication(const std::string& account_id,
                                const std::string& auth_header);
     Builder& SetCreationTime(base::TimeTicks creation_time);
     Builder& SetFetchAPI(FetchAPI fetch_api);
     // The language_model borrowed from the fetcher needs to stay alive until
     // the request body is built.
     Builder& SetLanguageModel(const translate::LanguageModel* language_model);
     Builder& SetParams(const RequestParams& params);
     Builder& SetParseJsonCallback(ParseJSONCallback callback);
-    Builder& SetPersonalization(Personalization personalization);
     // The tick_clock borrowed from the fetcher will be injected into the
     // request. It will be used at build time and after the fetch returned.
     // It has to be alive until the request is destroyed.
     Builder& SetTickClock(base::TickClock* tick_clock);
     Builder& SetUrl(const GURL& url);
     Builder& SetUrlRequestContextGetter(
         const scoped_refptr<net::URLRequestContextGetter>& context_getter);
     Builder& SetUserClassifier(const UserClassifier& user_classifier);
 
     // These preview methods allow to inspect the Request without exposing it
     // publicly.
     // TODO(fhorschig): Remove these when moving the Builder to
     // snippets::internal and trigger the request to intercept the request.
     std::string PreviewRequestBodyForTesting() { return BuildBody(); }
     std::string PreviewRequestHeadersForTesting() { return BuildHeaders(); }
     Builder& SetUserClassForTesting(const std::string& user_class) {
       user_class_ = user_class;
       return *this;
     }
 
    private:
     std::string BuildHeaders() const;
     std::string BuildBody() const;
     std::unique_ptr<net::URLFetcher> BuildURLFetcher(
         net::URLFetcherDelegate* request,
         const std::string& headers,
         const std::string& body) const;
 
-    bool ReturnOnlyPersonalizedResults() const {
-      return !obfuscated_gaia_id_.empty() &&
-             personalization_ == Personalization::kPersonal;
-    }
-
     void PrepareLanguages(
         translate::LanguageModel::LanguageInfo* ui_language,
         translate::LanguageModel::LanguageInfo* other_top_language) const;
 
     // Only required, if the request needs to be sent.
     std::string auth_header_;
     base::TickClock* tick_clock_;
     FetchAPI fetch_api_;
     RequestParams params_;
     ParseJSONCallback parse_json_callback_;
-    Personalization personalization_;
     GURL url_;
     scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
 
     // Optional properties.
     std::string obfuscated_gaia_id_;
     std::string user_class_;
     const translate::LanguageModel* language_model_;
 
     DISALLOW_COPY_AND_ASSIGN(Builder);
   };
@@ skipping 44 matching lines @@
   base::WeakPtrFactory<JsonRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JsonRequest);
 };
 
 }  // namespace internal
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REMOTE_JSON_REQUEST_H_