Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2855)

Unified Diff: chrome/browser/net/chrome_network_delegate.h

Issue 2336043007: Domain Reliability: Don't crash on shutdown with uploads pending (Closed)
Patch Set: Shutdown uploader in unittest Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/chrome_network_delegate.h
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h
index bce63311264116e87fe81896cbc383a02db8dd6d..37ac5796023b10d08d4c1e7860db674d5cd052c2 100644
--- a/chrome/browser/net/chrome_network_delegate.h
+++ b/chrome/browser/net/chrome_network_delegate.h
@@ -17,6 +17,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "components/data_use_measurement/content/data_use_measurement.h"
+#include "components/domain_reliability/monitor.h"
#include "components/metrics/data_use_tracker.h"
#include "components/prefs/pref_member.h"
#include "net/base/network_delegate_impl.h"
@@ -116,8 +117,8 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
}
void set_domain_reliability_monitor(
- domain_reliability::DomainReliabilityMonitor* monitor) {
- domain_reliability_monitor_ = monitor;
+ std::unique_ptr<domain_reliability::DomainReliabilityMonitor> monitor) {
+ domain_reliability_monitor_ = std::move(monitor);
}
void set_data_use_aggregator(
@@ -208,7 +209,8 @@ class ChromeNetworkDelegate : public net::NetworkDelegateImpl {
// Weak, owned by our owner.
const policy::URLBlacklistManager* url_blacklist_manager_;
- domain_reliability::DomainReliabilityMonitor* domain_reliability_monitor_;
+ std::unique_ptr<domain_reliability::DomainReliabilityMonitor>
+ domain_reliability_monitor_;
// When true, allow access to all file:// URLs.
static bool g_allow_file_access_;
« no previous file with comments | « no previous file | chrome/browser/net/chrome_network_delegate.cc » ('j') | components/domain_reliability/monitor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698