Reporting: Make DeliveryAgent self-scheduling.

net/reporting/reporting_test_util.cc

 // Copyright 2017 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 "net/reporting/reporting_test_util.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/simple_test_clock.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/timer/mock_timer.h"
-#include "base/timer/timer.h"
 #include "net/reporting/reporting_cache.h"
 #include "net/reporting/reporting_client.h"
 #include "net/reporting/reporting_context.h"
 #include "net/reporting/reporting_delegate.h"
+#include "net/reporting/reporting_delivery_agent.h"
 #include "net/reporting/reporting_garbage_collector.h"
 #include "net/reporting/reporting_persister.h"
 #include "net/reporting/reporting_policy.h"
 #include "net/reporting/reporting_uploader.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace net {
 
@@ skipping 85 matching lines @@
   pending_uploads_.push_back(base::MakeUnique<PendingUploadImpl>(
       url, json, callback, base::Bind(&ErasePendingUpload, &pending_uploads_)));
 }
 
 TestReportingContext::TestReportingContext(const ReportingPolicy& policy)
     : ReportingContext(policy,
                        base::MakeUnique<TestReportingDelegate>(),
                        base::MakeUnique<base::SimpleTestClock>(),
                        base::MakeUnique<base::SimpleTestTickClock>(),
                        base::MakeUnique<TestReportingUploader>()),
+      delivery_timer_(new base::MockTimer(/* retain_user_task= */ false,
+                                          /* is_repeating= */ false)),
       persistence_timer_(new base::MockTimer(/* retain_user_task= */ false,
                                              /* is_repeating= */ false)),
       garbage_collection_timer_(
           new base::MockTimer(/* retain_user_task= */ false,
                               /* is_repeating= */ false)) {
   persister()->SetTimerForTesting(base::WrapUnique(persistence_timer_));
   garbage_collector()->SetTimerForTesting(
       base::WrapUnique(garbage_collection_timer_));
+  delivery_agent()->SetTimerForTesting(base::WrapUnique(delivery_timer_));
 }
 
 TestReportingContext::~TestReportingContext() {
+  delivery_timer_ = nullptr;
   persistence_timer_ = nullptr;
   garbage_collection_timer_ = nullptr;
 }
 
 ReportingTestBase::ReportingTestBase() {
   // For tests, disable jitter.
   ReportingPolicy policy;
   policy.endpoint_backoff_policy.jitter_factor = 0.0;
 
   CreateAndInitializeContext(policy, std::unique_ptr<const base::Value>(),
@@ skipping 23 matching lines @@
   delegate()->PersistData(std::move(persisted_data));
   clock()->SetNow(now);
   tick_clock()->SetNowTicks(now_ticks);
   context_->Initialize();
 }
 
 base::TimeTicks ReportingTestBase::yesterday() {
   return tick_clock()->NowTicks() - base::TimeDelta::FromDays(1);
 }
 
+base::TimeTicks ReportingTestBase::now() {
+  return tick_clock()->NowTicks();
+}
+
 base::TimeTicks ReportingTestBase::tomorrow() {
   return tick_clock()->NowTicks() + base::TimeDelta::FromDays(1);
 }
 
 }  // namespace net