[remote suggestions] Attach the fetch time to RemoteSnippets, ContentSnippets and SnippetArticle

components/ntp_snippets/remote/json_request.cc

 // 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.
 
 #include "components/ntp_snippets/remote/json_request.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
-#include "base/time/tick_clock.h"
-#include "base/time/time.h"
+#include "base/time/clock.h"
 #include "base/values.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/features.h"
 #include "components/ntp_snippets/remote/request_params.h"
 #include "components/ntp_snippets/user_classifier.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/variations/net/variations_http_headers.h"
@@ skipping 124 matching lines @@
       /*has_view_all_action=*/false,
       /*show_if_empty=*/false,
       // TODO(tschumann): The message for no-articles is likely wrong
       // and needs to be added to the stubby protocol if we want to
       // support it.
       l10n_util::GetStringUTF16(IDS_NTP_ARTICLE_SUGGESTIONS_SECTION_EMPTY));
 }
 
 JsonRequest::JsonRequest(
     base::Optional<Category> exclusive_category,
-    base::TickClock* tick_clock,  // Needed until destruction of the request.
+    base::Clock* clock,  // Needed until destruction of the request.
     const ParseJSONCallback& callback)
     : exclusive_category_(exclusive_category),
-      tick_clock_(tick_clock),
+      clock_(clock),
       parse_json_callback_(callback),
       weak_ptr_factory_(this) {
-  creation_time_ = tick_clock_->NowTicks();
+  creation_time_ = clock_->Now();
 }
 
 JsonRequest::~JsonRequest() {
   LOG_IF(DFATAL, !request_completed_callback_.is_null())
       << "The CompletionCallback was never called!";
 }
 
 void JsonRequest::Start(CompletedCallback callback) {
   request_completed_callback_ = std::move(callback);
   url_fetcher_->Start();
 }
 
 base::TimeDelta JsonRequest::GetFetchDuration() const {
-  return tick_clock_->NowTicks() - creation_time_;
+  return clock_->Now() - creation_time_;
 }
 
 std::string JsonRequest::GetResponseString() const {
   std::string response;
   url_fetcher_->GetResponseAsString(&response);
   return response;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // URLFetcherDelegate overrides
@@ skipping 52 matching lines @@
 
 JsonRequest::Builder::Builder()
     : fetch_api_(CHROME_READER_API),
       language_model_(nullptr) {}
 JsonRequest::Builder::Builder(JsonRequest::Builder&&) = default;
 JsonRequest::Builder::~Builder() = default;
 
 std::unique_ptr<JsonRequest> JsonRequest::Builder::Build() const {
   DCHECK(!url_.is_empty());
   DCHECK(url_request_context_getter_);
-  DCHECK(tick_clock_);
-  auto request = base::MakeUnique<JsonRequest>(
-      params_.exclusive_category, tick_clock_, parse_json_callback_);
+  DCHECK(clock_);
+  auto request = base::MakeUnique<JsonRequest>(params_.exclusive_category,
+                                               clock_, parse_json_callback_);
   std::string body = BuildBody();
   std::string headers = BuildHeaders();
   request->url_fetcher_ = BuildURLFetcher(request.get(), headers, body);
 
   // Log the request for debugging network issues.
   VLOG(1) << "Sending a NTP snippets request to " << url_ << ":\n"
           << headers << "\n"
           << body;
 
   return request;
@@ skipping 23 matching lines @@
   params_ = params;
   return *this;
 }
 
 JsonRequest::Builder& JsonRequest::Builder::SetParseJsonCallback(
     ParseJSONCallback callback) {
   parse_json_callback_ = callback;
   return *this;
 }
 
-JsonRequest::Builder& JsonRequest::Builder::SetTickClock(
-    base::TickClock* tick_clock) {
-  tick_clock_ = tick_clock;
+JsonRequest::Builder& JsonRequest::Builder::SetClock(base::Clock* clock) {
+  clock_ = clock;
   return *this;
 }
 
 JsonRequest::Builder& JsonRequest::Builder::SetUrl(const GURL& url) {
   url_ = url;
   return *this;
 }
 
 JsonRequest::Builder& JsonRequest::Builder::SetUrlRequestContextGetter(
     const scoped_refptr<net::URLRequestContextGetter>& context_getter) {
@@ skipping 169 matching lines @@
           "NewTabPage.Languages.UILanguageRatioInTwoTopLanguages",
           ratio_ui_in_both_languages * 100);
       break;
     }
   }
 }
 
 }  // namespace internal
 
 }  // namespace ntp_snippets