Domain Reliability: Simplify configs and reports

components/domain_reliability/test_util.cc

 // 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.
 
 #include "components/domain_reliability/test_util.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "components/domain_reliability/scheduler.h"
 #include "net/url_request/url_request_status.h"
@@ skipping 142 matching lines @@
 }
 
 DomainReliabilityScheduler::Params MakeTestSchedulerParams() {
   DomainReliabilityScheduler::Params params;
   params.minimum_upload_delay = base::TimeDelta::FromMinutes(1);
   params.maximum_upload_delay = base::TimeDelta::FromMinutes(5);
   params.upload_retry_interval = base::TimeDelta::FromSeconds(15);
   return params;
 }
 
-scoped_ptr<const DomainReliabilityConfig> MakeTestConfig() {
-  return MakeTestConfigWithDomain("example");
+scoped_ptr<DomainReliabilityConfig> MakeTestConfig() {
+  return MakeTestConfigWithOrigin(GURL("https://example/"));
 }
 
-scoped_ptr<const DomainReliabilityConfig> MakeTestConfigWithDomain(
-    const std::string& domain) {
+scoped_ptr<DomainReliabilityConfig> MakeTestConfigWithOrigin(
+    const GURL& origin) {
   DomainReliabilityConfig* config = new DomainReliabilityConfig();
-  DomainReliabilityConfig::Resource* resource;
-
-  resource = new DomainReliabilityConfig::Resource();
-  resource->name = "always_report";
-  resource->url_patterns.push_back(
-      new std::string("http://*/always_report"));
-  resource->success_sample_rate = 1.0;
-  resource->failure_sample_rate = 1.0;
-  config->resources.push_back(resource);
-
-  resource = new DomainReliabilityConfig::Resource();
-  resource->name = "never_report";
-  resource->url_patterns.push_back(
-      new std::string("http://*/never_report"));
-  resource->success_sample_rate = 0.0;
-  resource->failure_sample_rate = 0.0;
-  config->resources.push_back(resource);
-
-  DomainReliabilityConfig::Collector* collector;
-  collector = new DomainReliabilityConfig::Collector();
-  collector->upload_url = GURL("https://exampleuploader/upload");
-  config->collectors.push_back(collector);
-
-  config->version = "1";
-  config->domain = domain;
+  config->origin = origin;
+  config->collectors.push_back(new GURL("https://exampleuploader/upload"));
+  config->failure_sample_rate = 1.0;
+  config->success_sample_rate = 0.0;
 
   DCHECK(config->IsValid());
 
-  return scoped_ptr<const DomainReliabilityConfig>(config);
+  return scoped_ptr<DomainReliabilityConfig>(config);
 }
 
 }  // namespace domain_reliability