Reporting: Make DeliveryAgent self-scheduling.

net/reporting/reporting_test_util.h

 // 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.
 
 #ifndef NET_REPORTING_REPORTING_TEST_UTIL_H_
 #define NET_REPORTING_REPORTING_TEST_UTIL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 92 matching lines @@
 
   TestReportingDelegate* test_delegate() {
     return reinterpret_cast<TestReportingDelegate*>(delegate());
   }
   base::SimpleTestClock* test_clock() {
     return reinterpret_cast<base::SimpleTestClock*>(clock());
   }
   base::SimpleTestTickClock* test_tick_clock() {
     return reinterpret_cast<base::SimpleTestTickClock*>(tick_clock());
   }
+  base::MockTimer* test_delivery_timer() { return delivery_timer_; }
   base::MockTimer* test_persistence_timer() { return persistence_timer_; }
   base::MockTimer* test_garbage_collection_timer() {
     return garbage_collection_timer_;
   }
   TestReportingUploader* test_uploader() {
     return reinterpret_cast<TestReportingUploader*>(uploader());
   }
 
  private:
   // Owned by the Persister and GarbageCollector, respectively, but referenced
   // here to preserve type:
 
+  base::MockTimer* delivery_timer_;
   base::MockTimer* persistence_timer_;
   base::MockTimer* garbage_collection_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(TestReportingContext);
 };
 
 // A unit test base class that provides a TestReportingContext and shorthand
 // getters.
 class ReportingTestBase : public ::testing::Test {
  protected:
@@ skipping 11 matching lines @@
 
   TestReportingContext* context() { return context_.get(); }
 
   const ReportingPolicy& policy() { return context_->policy(); }
 
   TestReportingDelegate* delegate() { return context_->test_delegate(); }
   base::SimpleTestClock* clock() { return context_->test_clock(); }
   base::SimpleTestTickClock* tick_clock() {
     return context_->test_tick_clock();
   }
+  base::MockTimer* delivery_timer() { return context_->test_delivery_timer(); }
   base::MockTimer* persistence_timer() {
     return context_->test_persistence_timer();
   }
   base::MockTimer* garbage_collection_timer() {
     return context_->test_garbage_collection_timer();
   }
   TestReportingUploader* uploader() { return context_->test_uploader(); }
 
   ReportingCache* cache() { return context_->cache(); }
   ReportingEndpointManager* endpoint_manager() {
     return context_->endpoint_manager();
   }
   ReportingDeliveryAgent* delivery_agent() {
     return context_->delivery_agent();
   }
   ReportingGarbageCollector* garbage_collector() {
     return context_->garbage_collector();
   }
 
   ReportingPersister* persister() { return context_->persister(); }
 
   base::TimeTicks yesterday();
+  base::TimeTicks now();
+  base::TimeTicks tomorrow();
 
-  base::TimeTicks tomorrow();
+  const std::vector<std::unique_ptr<TestReportingUploader::PendingUpload>>&
+  pending_uploads() {
+    return uploader()->pending_uploads();
+  }
 
  private:
   void CreateAndInitializeContext(
       const ReportingPolicy& policy,
       std::unique_ptr<const base::Value> persisted_data,
       base::Time now,
       base::TimeTicks now_ticks);
 
   std::unique_ptr<TestReportingContext> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ReportingTestBase);
 };
 
 }  // namespace net
 
 #endif  // NET_REPORING_REPORTING_TEST_UTIL_H_