[Doodle] Move ttl clamping from fetcher to service

components/doodle/doodle_fetcher_impl.cc

 // Copyright 2017 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/doodle/doodle_fetcher_impl.h"
 
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/google/core/browser/google_util.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 
 using net::URLFetcher;
 
 namespace doodle {
 
 namespace {
 
-const double kMaxTimeToLiveMS = 30.0 * 24 * 60 * 60 * 1000;  // 30 days
-
 // "/async/ddljson" is the base API path. "ntp:1" identifies this request as
 // being for a New Tab page. The "graybg:" param specifies whether the doodle
 // will be displayed on a gray background.
 const char kDoodleConfigPathFormat[] = "/async/ddljson?async=ntp:1,graybg:%d";
 
 std::string StripSafetyPreamble(const std::string& json) {
   // The response may start with )]}'. Ignore this.
   const char kResponsePreamble[] = ")]}'";
 
   base::StringPiece json_sp(json);
@@ skipping 103 matching lines @@
                         base::nullopt);
 }
 
 base::Optional<DoodleConfig> DoodleFetcherImpl::ParseDoodleConfigAndTimeToLive(
     const base::DictionaryValue& ddljson,
     base::TimeDelta* time_to_live) const {
   base::Optional<DoodleConfig> doodle =
       DoodleConfig::FromDictionary(ddljson, GetGoogleBaseUrl());
 
   // The JSON doesn't guarantee the number to fit into an int.
-  double ttl = 0;  // Expires immediately if the parameter is missing.
-  if (!ddljson.GetDouble("time_to_live_ms", &ttl) || ttl < 0) {
+  double ttl_ms = 0;  // Expires immediately if the parameter is missing.
+  if (!ddljson.GetDouble("time_to_live_ms", &ttl_ms) || ttl_ms < 0) {
     DLOG(WARNING) << "No valid Doodle TTL present in ddljson!";
-    ttl = 0;
+    ttl_ms = 0;
   }
-  // TODO(treib,fhorschig): Move this logic into the service.
-  if (ttl > kMaxTimeToLiveMS) {
-    ttl = kMaxTimeToLiveMS;
-    DLOG(WARNING) << "Clamping Doodle TTL to 30 days!";
-  }
-  *time_to_live = base::TimeDelta::FromMillisecondsD(ttl);
+  *time_to_live = base::TimeDelta::FromMillisecondsD(ttl_ms);
 
   return doodle;
 }
 
 void DoodleFetcherImpl::RespondToAllCallbacks(
     DoodleState state,
     base::TimeDelta time_to_live,
     const base::Optional<DoodleConfig>& config) {
   for (auto& callback : callbacks_) {
     std::move(callback).Run(state, time_to_live, config);
   }
   callbacks_.clear();
 }
 
 GURL DoodleFetcherImpl::GetGoogleBaseUrl() const {
   GURL cmd_line_url = google_util::CommandLineGoogleBaseURL();
   if (cmd_line_url.is_valid()) {
     return cmd_line_url;
   }
   return google_url_tracker_->google_url();
 }
 
 }  // namespace doodle