Domain Reliability: Simplify configs and reports

components/domain_reliability/util.cc

Index: components/domain_reliability/util.cc
diff --git a/components/domain_reliability/util.cc b/components/domain_reliability/util.cc
index 06a8942eaf7a0c8d812f383ae3787ebd5a2e1c14..5fca298187d9d02333ad9026ef04acfc2215f4e5 100644
--- a/components/domain_reliability/util.cc
+++ b/components/domain_reliability/util.cc
@@ -67,6 +67,11 @@ const struct NetErrorMapping {
   { net::ERR_SSL_UNRECOGNIZED_NAME_ALERT, "ssl.unrecognized_name_alert" }
 };
 
+bool CanReportFullBeaconURLToCollector(const GURL& beacon_url,
+                                       const GURL& collector_url) {
+  return beacon_url.GetOrigin() == collector_url.GetOrigin();
+}
+
 }  // namespace
 
 // static
@@ -154,6 +159,34 @@ void GetUploadResultFromResponseDetails(
   return;
 }
 
+// N.B. This uses a ScopedVector because that's what JSONValueConverter uses
+// for repeated fields of any type, and Config uses JSONValueConverter to parse
+// JSON configs.
+GURL SanitizeURLForReport(const GURL& beacon_url,
+                          const GURL& collector_url,
+                          const ScopedVector<std::string>& path_prefixes) {
+  if (CanReportFullBeaconURLToCollector(beacon_url, collector_url))
+    return beacon_url.GetAsReferrer();
+
+  std::string path = beacon_url.path();
+  const std::string empty_path;
+  const std::string* longest_path_prefix = &empty_path;
+  for (const std::string* path_prefix : path_prefixes) {

[Randy Smith (Not in Mondays), 2015/10/29 22:36:11]

nit, suggestion: I'd be inclined to use a const reference here, and take the
address of the reference below; I think that matches what I've seen elsewhere
better.

[Deprecated (see juliatuttle), 2015/11/02 23:19:31]

Can't; path_prefixes is a vector of std::string*. (ScopedVector's template hides
the pointer type.)

[Randy Smith (Not in Mondays), 2015/11/03 21:48:12]

Acknowledged.

+    if (path.substr(0, path_prefix->length()) == *path_prefix &&
+        path_prefix->length() > longest_path_prefix->length()) {
+      longest_path_prefix = path_prefix;
+    }
+  }
+
+  GURL::Replacements replacements;
+  replacements.ClearUsername();
+  replacements.ClearPassword();
+  replacements.SetPathStr(*longest_path_prefix);
+  replacements.ClearQuery();
+  replacements.ClearRef();
+  return beacon_url.ReplaceComponents(replacements);
+}
+
 namespace {
 
 class ActualTimer : public MockableTime::Timer {