Domain Reliability: Deduplicate some code into test_util

components/domain_reliability/context_unittest.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/context.h"
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 19 matching lines @@
   beacon.http_response_code = 200;
   beacon.elapsed = base::TimeDelta::FromMilliseconds(250);
   beacon.start_time = time->NowTicks() - beacon.elapsed;
   return beacon;
 }
 
 class DomainReliabilityContextTest : public testing::Test {
  protected:
   DomainReliabilityContextTest()
       : dispatcher_(&time_),
-        params_(CreateParams()),
+        params_(MakeTestSchedulerParams()),
         uploader_(base::Bind(&DomainReliabilityContextTest::OnUploadRequest,
                              base::Unretained(this))),
         upload_reporter_string_("test-reporter"),
         context_(&time_,
                  params_,
                  upload_reporter_string_,
                  &dispatcher_,
                  &uploader_,
-                 CreateConfig().Pass()),
+                 MakeTestConfig().Pass()),
         upload_pending_(false) {}
 
   TimeDelta min_delay() const { return params_.minimum_upload_delay; }
   TimeDelta max_delay() const { return params_.maximum_upload_delay; }
   TimeDelta retry_interval() const { return params_.upload_retry_interval; }
   TimeDelta zero_delta() const { return TimeDelta::FromMicroseconds(0); }
 
   bool upload_pending() { return upload_pending_; }
 
   const std::string& upload_report() {
@@ skipping 38 matching lines @@
       const std::string& report_json,
       const GURL& upload_url,
       const DomainReliabilityUploader::UploadCallback& callback) {
     DCHECK(!upload_pending_);
     upload_report_ = report_json;
     upload_url_ = upload_url;
     upload_callback_ = callback;
     upload_pending_ = true;
   }
 
-  static DomainReliabilityScheduler::Params CreateParams() {
-    DomainReliabilityScheduler::Params params;
-    params.minimum_upload_delay = base::TimeDelta::FromSeconds(60);
-    params.maximum_upload_delay = base::TimeDelta::FromSeconds(300);
-    params.upload_retry_interval = base::TimeDelta::FromSeconds(15);
-    return params;
-  }
-
-  static scoped_ptr<const DomainReliabilityConfig> CreateConfig() {
-    DomainReliabilityConfig* config = new DomainReliabilityConfig();
-    DomainReliabilityConfig::Resource* resource;
-
-    resource = new DomainReliabilityConfig::Resource();
-    resource->name = "always_report";
-    resource->url_patterns.push_back(
-        new std::string("http://example/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://example/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://example/upload");
-    config->collectors.push_back(collector);
-
-    return scoped_ptr<const DomainReliabilityConfig>(config);
-  }
-
   bool upload_pending_;
   std::string upload_report_;
   GURL upload_url_;
   DomainReliabilityUploader::UploadCallback upload_callback_;
 };
 
 TEST_F(DomainReliabilityContextTest, Create) {
   EXPECT_TRUE(CheckNoBeacons(0));
   EXPECT_TRUE(CheckCounts(0, 0, 0));
   EXPECT_TRUE(CheckNoBeacons(1));
@@ skipping 50 matching lines @@
 
   time_.Advance(max_delay());
   EXPECT_TRUE(upload_pending());
   EXPECT_EQ(kExpectedReport, upload_report());
   EXPECT_EQ(GURL("https://example/upload"), upload_url());
   CallUploadCallback(true);
 }
 
 }  // namespace
 }  // namespace domain_reliability