[Doodle] Pull time_to_live out of DoodleConfig

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/time/time.h"
@@ skipping 94 matching lines @@
 }
 
 void DoodleFetcherImpl::OnURLFetchComplete(const URLFetcher* source) {
   DCHECK_EQ(fetcher_.get(), source);
   std::unique_ptr<net::URLFetcher> free_fetcher = std::move(fetcher_);
 
   std::string json_string;
   if (!(source->GetStatus().is_success() &&
         source->GetResponseCode() == net::HTTP_OK &&
         source->GetResponseAsString(&json_string))) {
-    RespondToAllCallbacks(DoodleState::DOWNLOAD_ERROR, base::nullopt);
+    RespondToAllCallbacks(DoodleState::DOWNLOAD_ERROR, base::TimeDelta(),
+                          base::nullopt);
     return;
   }
 
   json_parsing_callback_.Run(StripSafetyPreamble(std::move(json_string)),
                              base::Bind(&DoodleFetcherImpl::OnJsonParsed,
                                         weak_ptr_factory_.GetWeakPtr()),
                              base::Bind(&DoodleFetcherImpl::OnJsonParseFailed,
                                         weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DoodleFetcherImpl::OnJsonParsed(std::unique_ptr<base::Value> json) {
   std::unique_ptr<base::DictionaryValue> config =
       base::DictionaryValue::From(std::move(json));
   if (!config.get()) {
     DLOG(WARNING) << "Doodle JSON is not valid.";
-    RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::nullopt);
+    RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::TimeDelta(),
+                          base::nullopt);
     return;
   }
 
   const base::DictionaryValue* ddljson = nullptr;
   if (!config->GetDictionary("ddljson", &ddljson)) {
     DLOG(WARNING) << "Doodle JSON response did not contain 'ddljson' key.";
-    RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::nullopt);
+    RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::TimeDelta(),
+                          base::nullopt);
     return;
   }
 
-  base::Optional<DoodleConfig> doodle = ParseDoodle(*ddljson);
+  base::TimeDelta time_to_live;
+  base::Optional<DoodleConfig> doodle = ParseDoodle(*ddljson, &time_to_live);
   if (!doodle.has_value()) {
-    RespondToAllCallbacks(DoodleState::NO_DOODLE, base::nullopt);
+    RespondToAllCallbacks(DoodleState::NO_DOODLE, base::TimeDelta(),
+                          base::nullopt);
     return;
   }
 
-  RespondToAllCallbacks(DoodleState::AVAILABLE, std::move(doodle));
+  RespondToAllCallbacks(DoodleState::AVAILABLE, time_to_live,
+                        std::move(doodle));
 }
 
 void DoodleFetcherImpl::OnJsonParseFailed(const std::string& error_message) {
   DLOG(WARNING) << "JSON parsing failed: " << error_message;
-  RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::nullopt);
+  RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::TimeDelta(),
+                        base::nullopt);
 }
 
 base::Optional<DoodleConfig> DoodleFetcherImpl::ParseDoodle(
-    const base::DictionaryValue& ddljson) const {
+    const base::DictionaryValue& ddljson,
+    base::TimeDelta* time_to_live) const {
   DoodleConfig doodle;
+  ParseBaseInformation(ddljson, &doodle, time_to_live);

[fhorschig, 2017/03/02 13:18:08]

Is there a good reason to pull this up?
If ParseImage fails, all of this work was unnecessary.

[Marc Treib, 2017/03/02 14:30:08]

Not really, it just seemed a bit weird to me that the base information is parsed
last. I moved it down again.

   // The |large_image| field is required (it's the "default" representation for
   // the doodle).
   if (!ParseImage(ddljson, "large_image", &doodle.large_image)) {
     return base::nullopt;
   }
   ParseImage(ddljson, "transparent_large_image",
              &doodle.transparent_large_image);
   ParseImage(ddljson, "large_cta_image", &doodle.large_cta_image);
-  ParseBaseInformation(ddljson, &doodle);
   return doodle;
 }
 
 bool DoodleFetcherImpl::ParseImage(const base::DictionaryValue& image_parent,
                                    const std::string& image_name,
                                    DoodleImage* image) const {
   DCHECK(image);
   const base::DictionaryValue* image_dict = nullptr;
   if (!image_parent.GetDictionary(image_name, &image_dict)) {
     return false;
   }
   image->url = ParseRelativeUrl(*image_dict, "url");
   if (!image->url.is_valid()) {
     DLOG(WARNING) << "Image URL for \"" << image_name << "\" is invalid.";
     return false;
   }
   image_dict->GetInteger("height", &image->height);
   image_dict->GetInteger("width", &image->width);
   image_dict->GetBoolean("is_animated_gif", &image->is_animated_gif);
   image_dict->GetBoolean("is_cta", &image->is_cta);
   return true;
 }
 
 void DoodleFetcherImpl::ParseBaseInformation(
     const base::DictionaryValue& ddljson,
-    DoodleConfig* config) const {
+    DoodleConfig* config,
+    base::TimeDelta* time_to_live) const {
   config->search_url = ParseRelativeUrl(ddljson, "search_url");
   config->target_url = ParseRelativeUrl(ddljson, "target_url");
   config->fullpage_interactive_url =
       ParseRelativeUrl(ddljson, "fullpage_interactive_url");
 
   config->doodle_type = ParseDoodleType(ddljson);
   ddljson.GetString("alt_text", &config->alt_text);
   ddljson.GetString("interactive_html", &config->interactive_html);
 
   // 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) {
     DLOG(WARNING) << "No valid Doodle TTL present in ddljson!";
     ttl = 0;
   }
   // TODO(treib,fhorschig): Move this logic into the service.
   if (ttl > kMaxTimeToLiveMS) {
     ttl = kMaxTimeToLiveMS;
     DLOG(WARNING) << "Clamping Doodle TTL to 30 days!";
   }
-  config->time_to_live = base::TimeDelta::FromMillisecondsD(ttl);
+  *time_to_live = base::TimeDelta::FromMillisecondsD(ttl);
 }
 
 GURL DoodleFetcherImpl::ParseRelativeUrl(
     const base::DictionaryValue& dict_value,
     const std::string& key) const {
   std::string str_url;
   dict_value.GetString(key, &str_url);
   if (str_url.empty()) {
     return GURL();
   }
   return GetGoogleBaseUrl().Resolve(str_url);
 }
 
 void DoodleFetcherImpl::RespondToAllCallbacks(
     DoodleState state,
+    base::TimeDelta time_to_live,
     const base::Optional<DoodleConfig>& config) {
   for (auto& callback : callbacks_) {
-    std::move(callback).Run(state, config);
+    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