Domain Reliability: Simplify configs and reports

components/domain_reliability/beacon.h

 // Copyright 2014 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_DOMAIN_RELIABILITY_BEACON_H_
 #define COMPONENTS_DOMAIN_RELIABILITY_BEACON_H_
 
 #include <string>
 
+#include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "components/domain_reliability/domain_reliability_export.h"
+#include "url/gurl.h"
 
 namespace base {
 class Value;
 }  // namespace base
 
 namespace domain_reliability {
 
 // The per-request data that is uploaded to the Domain Reliability collector.
 struct DOMAIN_RELIABILITY_EXPORT DomainReliabilityBeacon {
  public:
   DomainReliabilityBeacon();
   ~DomainReliabilityBeacon();
 
+  struct DOMAIN_RELIABILITY_EXPORT ReportParams {

[davidben, 2015/10/20 23:35:54]

Does this actually buy you anything over a four-argument ToValue method? Because
of the const references in the struct, the only way you can fill out this thing
is by calling the four-argument ReportParams constructor. So instead of

  base::Value* blah = blah->ToValue(blah, blah, blah, blah);

You write

  ReportParams report_params(blah, blah, blah, blah);
  base::Value* blah = blah->ToValue(report_params);

or

  base::Value* blah = blah->ToValue(ReportParams(blah, blah, blah, blah));

It's not clear to me this is any better.

[Deprecated (see juliatuttle), 2015/10/26 19:08:41]

Done.

+   public:
+    ReportParams(base::TimeTicks upload_time,
+                 base::TimeTicks last_network_change_time,
+                 const GURL& collector_url,
+                 const ScopedVector<std::string>& path_prefixes);
+
+    base::TimeTicks upload_time;
+    base::TimeTicks last_network_change_time;
+    const GURL& collector_url;
+    const ScopedVector<std::string>& path_prefixes;
+  };
+
   // Converts the Beacon to JSON format for uploading. Calculates the age
   // relative to an upload time of |upload_time|.
-  base::Value* ToValue(base::TimeTicks upload_time,
-                       base::TimeTicks last_network_change_time) const;
+  base::Value* ToValue(const ReportParams& report_params) const;

[davidben, 2015/10/20 23:35:54]

Existing code, but this would probably be better returned as a scoped_ptr. (Just
checked and base::ListValue::Append has a scoped_ptr version nowadays.)

[Deprecated (see juliatuttle), 2015/10/26 19:08:41]

Done.

 
   // The URL that the beacon is reporting on, if included.
-  std::string url;
-  // The domain that the beacon is reporting on, if included.
-  std::string domain;
+  GURL url;
   // The resource name that the beacon is reporting on, if included.
   std::string resource;
   // Status string (e.g. "ok", "dns.nxdomain", "http.403").
   std::string status;
   // Net error code.  Encoded as a string in the final JSON.
   int chrome_error;
   // IP address of the server the request went to.
   std::string server_ip;
   // Whether the request went through a proxy. If true, |server_ip| will be
   // empty.
   bool was_proxied;
   // Protocol used to make the request.
   std::string protocol;
   // HTTP response code returned by the server, or -1 if none was received.
   int http_response_code;
   // Elapsed time between starting and completing the request.
   base::TimeDelta elapsed;
   // Start time of the request.  Encoded as the request age in the final JSON.
   base::TimeTicks start_time;
 
   // Okay to copy and assign.
 };
 
 }  // namespace domain_reliability
 
 #endif  // COMPONENTS_DOMAIN_RELIABILITY_BEACON_H_