Introduce a Doodle Fetcher for NTP

components/doodle/doodle_fetcher.cc

Index: components/doodle/doodle_fetcher.cc
diff --git a/components/doodle/doodle_fetcher.cc b/components/doodle/doodle_fetcher.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8b9a61a92a6539255fc51e8b0020cd7769315e3a
--- /dev/null
+++ b/components/doodle/doodle_fetcher.cc
@@ -0,0 +1,237 @@
+// 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.h"
+
+#include <utility>
+
+#include "base/strings/string_number_conversions.h"
+#include "base/time/clock.h"
+#include "base/time/default_clock.h"
+#include "base/time/time.h"
+#include "base/values.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"
+#include "url/gurl.h"

[Marc Treib, 2017/02/10 10:28:47]

nit: already included in the header

[fhorschig, 2017/02/13 09:20:57]

Gone.

+
+using net::URLFetcher;
+
+namespace doodle {
+
+namespace {
+
+const double kMaxTimeToLiveMS = 30.0 * 24 * 60 * 60 * 1000;  // 30 days
+
+const char kDoodleConfigPath[] = "/async/ddljson";
+
+std::string StripSafetyPreamble(const std::string& json) {
+  // The response may start with )]}'. Ignore this.
+  const char kResponsePreamble[] = ")]}'";
+
+  base::StringPiece json_sp(json);
+  if (json_sp.starts_with(kResponsePreamble)) {
+    json_sp.remove_prefix(strlen(kResponsePreamble));
+  }
+
+  return json_sp.as_string();
+}
+
+DoodleType ParseDoodleType(const base::DictionaryValue& ddljson) {
+  std::string type_str;
+  ddljson.GetString("doodle_type", &type_str);
+  if (type_str == "SIMPLE") {
+    return DoodleType::SIMPLE;
+  }
+  if (type_str == "RANDOM") {
+    return DoodleType::RANDOM;
+  }
+  if (type_str == "VIDEO") {
+    return DoodleType::VIDEO;
+  }
+  if (type_str == "INTERACTIVE") {
+    return DoodleType::INTERACTIVE;
+  }
+  if (type_str == "INLINE_INTERACTIVE") {
+    return DoodleType::INLINE_INTERACTIVE;
+  }
+  if (type_str == "SLIDESHOW") {
+    return DoodleType::SLIDESHOW;
+  }
+  return DoodleType::UNKNOWN;
+}
+
+}  // namespace
+
+DoodleImage::DoodleImage()
+    : height(0), width(0), is_animated_gif(false), is_cta(false) {}
+DoodleImage::~DoodleImage() = default;
+
+DoodleConfig::DoodleConfig() : doodle_type(DoodleType::UNKNOWN) {}
+DoodleConfig::DoodleConfig(const DoodleConfig& config) = default;
+DoodleConfig::~DoodleConfig() = default;
+
+DoodleFetcher::DoodleFetcher(net::URLRequestContextGetter* download_context,
+                             GoogleURLTracker* google_url_tracker,
+                             const ParseJSONCallback& json_parsing_callback)
+    : download_context_(download_context),
+      json_parsing_callback_(json_parsing_callback),
+      google_url_tracker_(google_url_tracker),
+      clock_(new base::DefaultClock()),
+      weak_ptr_factory_(this) {
+  DCHECK(google_url_tracker_);
+}
+
+DoodleFetcher::~DoodleFetcher() {}

[Marc Treib, 2017/02/10 10:28:47]

nit: = default

[fhorschig, 2017/02/13 09:20:57]

Done.

+
+void DoodleFetcher::FetchDoodle(FinishedCallback callback) {
+  callbacks_.push_back(std::move(callback));
+  if (callbacks_.size() > 1) {

[Marc Treib, 2017/02/10 10:28:47]

Would "if (fetcher_)" be a more straightforward way of checking whether a fetch
is currently in progress? fetcher_ should be non-null exactly while a fetch is
ongoing, correct?

[fhorschig, 2017/02/13 09:20:57]

Hmm, yes. Changed condition and the fetcher_ to be deleted later.

+    // If there was already another callback, a request is still running.
+    return;
+  }
+  DCHECK(!fetcher_.get());
+  fetcher_ = URLFetcher::Create(GetGoogleBaseUrl().Resolve(kDoodleConfigPath),
+                                URLFetcher::GET, this);
+  fetcher_->SetRequestContext(download_context_);
+  fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
+                         net::LOAD_DO_NOT_SAVE_COOKIES);
+  fetcher_->SetAutomaticallyRetryOnNetworkChanges(1);
+  fetcher_->Start();
+}
+
+// net::URLFetcherDelegate implementation.

[Marc Treib, 2017/02/10 10:28:48]

nit: comment not required here (there's one in the header)

[fhorschig, 2017/02/13 09:20:57]

Gone.

+void DoodleFetcher::OnURLFetchComplete(const net::URLFetcher* source) {

[Marc Treib, 2017/02/10 10:28:47]

nit: There's a "using net::URLFetcher" above, so the "net::" prefix isn't
required. (Though TBH, I might just remove the "using" and specify the prefix
everywhere... up to you)

[fhorschig, 2017/02/13 09:20:57]

net:: Gone. (I like the using for readability of the fetcher creation)

+  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);
+    return;
+  }
+
+  json_parsing_callback_.Run(
+      StripSafetyPreamble(std::move(json_string)),
+      base::Bind(&DoodleFetcher::OnJsonParsed, weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&DoodleFetcher::OnJsonParseFailed,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void DoodleFetcher::OnJsonParsed(std::unique_ptr<base::Value> json) {
+  std::unique_ptr<base::DictionaryValue> dict =
+      base::DictionaryValue::From(std::move(json));
+  if (!dict.get()) {
+    DLOG(WARNING) << "Doodle JSON is not valid";
+    RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::nullopt);
+    return;
+  }
+
+  ParseDoodle(std::move(dict));
+}
+
+void DoodleFetcher::OnJsonParseFailed(const std::string& error_message) {
+  DLOG(WARNING) << "JSON parsing failed: " << error_message;
+  RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::nullopt);
+}
+
+void DoodleFetcher::ParseDoodle(std::unique_ptr<base::DictionaryValue> config) {

[Marc Treib, 2017/02/10 10:28:47]

nit: This is different from the other "Parse*" methods - it does more than just
parsing. Can we find a better name and/or split off the actual parsing from the
rest (calling callbacks)?

[fhorschig, 2017/02/13 09:20:57]

Done. |OnJsonParsed| is where callback are called and ParseDoodle returns
only the result.

+  const base::DictionaryValue* ddljson = nullptr;
+  if (!config->GetDictionary("ddljson", &ddljson)) {
+    DLOG(WARNING) << "Doodle JSON reponse did not contain 'ddljson' key.";
+    RespondToAllCallbacks(DoodleState::PARSING_ERROR, base::nullopt);
+    return;
+  }
+
+  DoodleConfig result;
+
+  if (!ParseImage(*ddljson, "large_image", &result.large_image)) {
+    RespondToAllCallbacks(DoodleState::NO_DOODLE, base::nullopt);
+    return;
+  }
+  ParseImage(*ddljson, "transparent_large_image",
+             &result.transparent_large_image);
+  ParseImage(*ddljson, "large_cta_image", &result.large_cta_image);
+  ParseBaseInformation(*ddljson, &result);
+
+  RespondToAllCallbacks(DoodleState::AVAILABLE, std::move(result));
+}
+
+bool DoodleFetcher::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 DoodleFetcher::ParseBaseInformation(const base::DictionaryValue& ddljson,
+                                         DoodleConfig* config) 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);
+  ddljson.GetString("interactive_js", &config->interactive_js);
+
+  // 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 image TTL present in ddljson!";
+    ttl = 0;
+  }
+  if (ttl > kMaxTimeToLiveMS) {
+    ttl = kMaxTimeToLiveMS;
+    DLOG(WARNING) << "Clamping Doodle image TTL to 30 days!";
+  }
+  config->expiry_date = clock_->Now() + base::TimeDelta::FromMillisecondsD(ttl);
+}
+
+GURL DoodleFetcher::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 DoodleFetcher::RespondToAllCallbacks(
+    DoodleState state,
+    const base::Optional<DoodleConfig>& config) {
+  for (auto& callback : callbacks_) {
+    std::move(callback).Run(state, config);
+  }
+  callbacks_.clear();
+}
+
+GURL DoodleFetcher::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