Domain Reliability: Deduplicate some code into test_util

components/domain_reliability/scheduler_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/scheduler.h"
 
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "components/domain_reliability/config.h"
 #include "components/domain_reliability/test_util.h"
 #include "components/domain_reliability/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace domain_reliability {
 namespace {
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 class DomainReliabilitySchedulerTest : public testing::Test {
  public:
   DomainReliabilitySchedulerTest()
       : num_collectors_(0),
-        params_(CreateDefaultParams()),
+        params_(MakeTestSchedulerParams()),
         callback_called_(false) {}
 
   void CreateScheduler(int num_collectors) {
     DCHECK_LT(0, num_collectors);
     DCHECK(!scheduler_);
 
     num_collectors_ = num_collectors;
     scheduler_.reset(new DomainReliabilityScheduler(
         &time_,
         num_collectors_,
         params_,
         base::Bind(&DomainReliabilitySchedulerTest::ScheduleUploadCallback,
                    base::Unretained(this))));
   }
 
-  static DomainReliabilityScheduler::Params CreateDefaultParams() {
-    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;
-  }
-
   ::testing::AssertionResult CheckNoPendingUpload() {
     DCHECK(scheduler_);
 
     if (!callback_called_)
       return ::testing::AssertionSuccess();
 
     return ::testing::AssertionFailure()
            << "expected no upload, got upload between "
            << callback_min_.InSeconds() << " and "
            << callback_max_.InSeconds() << " seconds from now";
@@ skipping 185 matching lines @@
   ASSERT_TRUE(CheckPendingUpload(min_delay(), max_delay()));
 
   time_.Advance(min_delay());
   ASSERT_TRUE(CheckStartingUpload(0));
   scheduler_->OnUploadComplete(true);
   ASSERT_TRUE(CheckNoPendingUpload());
 }
 
 }  // namespace
 }  // namespace domain_reliability