Index: chrome/browser/safe_browsing/safe_browsing_service.h |
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h |
index 27e15b03e9de51ac031f5fda6557acc9ee0be8dc..6601e01768b6789955eef05a671c76822b9ab0d1 100644 |
--- a/chrome/browser/safe_browsing/safe_browsing_service.h |
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h |
@@ -121,7 +121,7 @@ class SafeBrowsingService : public base::RefCountedThreadSafe< |
return services_delegate_->GetDownloadService(); |
} |
- net::URLRequestContextGetter* url_request_context(); |
+ scoped_refptr<net::URLRequestContextGetter> url_request_context(); |
const scoped_refptr<SafeBrowsingUIManager>& ui_manager() const; |
@@ -159,12 +159,15 @@ class SafeBrowsingService : public base::RefCountedThreadSafe< |
// Type for subscriptions to SafeBrowsing service state. |
typedef base::CallbackList<void(void)>::Subscription StateSubscription; |
+ typedef base::CallbackList<void(void)>::Subscription ShutdownSubscription; |
// Adds a listener for when SafeBrowsing preferences might have changed. |
// To get the current state, the callback should call enabled_by_prefs(). |
// Should only be called on the UI thread. |
std::unique_ptr<StateSubscription> RegisterStateCallback( |
const base::Callback<void(void)>& callback); |
+ std::unique_ptr<ShutdownSubscription> RegisterShutdownCallback( |
Jialiu Lin
2016/12/16 01:55:24
Could you add some comments on what thread these w
meacer
2016/12/16 20:26:36
Done.
|
+ const base::Callback<void(void)>& callback); |
// Sends serialized download report to backend. |
virtual void SendSerializedDownloadReport(const std::string& report); |
@@ -282,6 +285,7 @@ class SafeBrowsingService : public base::RefCountedThreadSafe< |
// Callbacks when SafeBrowsing state might have changed. |
// Should only be accessed on the UI thread. |
base::CallbackList<void(void)> state_callback_list_; |
+ base::CallbackList<void(void)> shutdown_callback_list_; |
// The UI manager handles showing interstitials. Accessed on both UI and IO |
// thread. |