Domain Reliability: Don't clear "upload pending" bit until upload starts

components/domain_reliability/scheduler.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 <algorithm>
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 71 matching lines @@
 void DomainReliabilityScheduler::OnBeaconAdded() {
   if (!upload_pending_)
     first_beacon_time_ = time_->NowTicks();
   upload_pending_ = true;
   MaybeScheduleUpload();
 }
 
 size_t DomainReliabilityScheduler::OnUploadStart() {
   DCHECK(upload_scheduled_);
   DCHECK_EQ(kInvalidCollectorIndex, collector_index_);
+  upload_pending_ = false;
   upload_scheduled_ = false;
   upload_running_ = true;
 
   base::TimeTicks now = time_->NowTicks();
   base::TimeTicks min_upload_time;
   GetNextUploadTimeAndCollector(now, &min_upload_time, &collector_index_);
   DCHECK(min_upload_time <= now);
 
   VLOG(1) << "Starting upload to collector " << collector_index_ << ".";
 
@@ skipping 30 matching lines @@
 
   MaybeScheduleUpload();
 }
 
 DomainReliabilityScheduler::CollectorState::CollectorState() : failures(0) {}
 
 void DomainReliabilityScheduler::MaybeScheduleUpload() {
   if (!upload_pending_ || upload_scheduled_ || upload_running_)
     return;
 
-  upload_pending_ = false;
   upload_scheduled_ = true;
   old_first_beacon_time_ = first_beacon_time_;
 
   base::TimeTicks now = time_->NowTicks();
 
   base::TimeTicks min_by_deadline, max_by_deadline;
   min_by_deadline = first_beacon_time_ + params_.minimum_upload_delay;
   max_by_deadline = first_beacon_time_ + params_.maximum_upload_delay;
   DCHECK(min_by_deadline <= max_by_deadline);
 
@@ skipping 50 matching lines @@
     return base::TimeDelta::FromSeconds(0);
   else {
     // Don't back off more than 64x the original delay.
     if (failures > 7)
       failures = 7;
     return params_.upload_retry_interval * (1 << (failures - 1));
   }
 }
 
 }  // namespace domain_reliability