Domain Reliability: Don't crash on shutdown with uploads pending

components/domain_reliability/monitor.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/monitor.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 137 matching lines @@
 
   // Make sure the URLRequestContext actually lives on what was declared to be
   // the network thread.
   DCHECK(url_request_context_getter->GetNetworkTaskRunner()->
          RunsTasksOnCurrentThread());
 
   uploader_ = DomainReliabilityUploader::Create(time_.get(),
                                                 url_request_context_getter);
 }
 
+void DomainReliabilityMonitor::Shutdown() {
+  uploader_->Shutdown();
+}
+
 void DomainReliabilityMonitor::AddBakedInConfigs() {
   DCHECK(OnNetworkThread());
   DCHECK(moved_to_network_thread_);
 
   for (size_t i = 0; kBakedInJsonConfigs[i]; ++i) {
     base::StringPiece json(kBakedInJsonConfigs[i]);
     std::unique_ptr<const DomainReliabilityConfig> config =
         DomainReliabilityConfig::FromJSON(json);
     if (!config) {
       DLOG(WARNING) << "Baked-in Domain Reliability config failed to parse: "
@@ skipping 74 matching lines @@
   return std::move(data_value);
 }
 
 DomainReliabilityContext* DomainReliabilityMonitor::AddContextForTesting(
     std::unique_ptr<const DomainReliabilityConfig> config) {
   DCHECK(OnNetworkThread());
 
   return context_manager_.AddContextForConfig(std::move(config));
 }
 
+void DomainReliabilityMonitor::ForceUploadsForTesting() {
+  dispatcher_.RunAllTasksForTesting();
+}
+
 std::unique_ptr<DomainReliabilityContext>
 DomainReliabilityMonitor::CreateContextForConfig(
     std::unique_ptr<const DomainReliabilityConfig> config) {
   DCHECK(OnNetworkThread());
   DCHECK(config);
   DCHECK(config->IsValid());
 
   return base::MakeUnique<DomainReliabilityContext>(
       time_.get(), scheduler_params_, upload_reporter_string_,
       &last_network_change_time_, &dispatcher_, uploader_.get(),
@@ skipping 157 matching lines @@
       break;
   }
 }
 
 base::WeakPtr<DomainReliabilityMonitor>
 DomainReliabilityMonitor::MakeWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 }  // namespace domain_reliability