Respect QuicAllowed policy for new streams

chrome/browser/safe_browsing/safe_browsing_service.cc

Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index d124f5a5afa72b017b5e3bbc8227dce09df5b740..17bdd009a1f30a1e615c40ff1d7fd3ee10c64c87 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -139,6 +139,10 @@ class SafeBrowsingURLRequestContextGetter
   // true.
   void ServiceShuttingDown();
 
+  // Disables QUIC. This should not be necessary anymore when
+  // http://crbug.com/678653 is implemented.
+  void DisableQuicOnIOThread();
+
  protected:
   ~SafeBrowsingURLRequestContextGetter() override;
 
@@ -239,6 +243,13 @@ void SafeBrowsingURLRequestContextGetter::ServiceShuttingDown() {
   safe_browsing_request_context_.reset();
 }
 
+void SafeBrowsingURLRequestContextGetter::DisableQuicOnIOThread() {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (http_network_session_)
+    http_network_session_->DisableQuic();
+}
+
 SafeBrowsingURLRequestContextGetter::~SafeBrowsingURLRequestContextGetter() {}
 
 // static
@@ -393,6 +404,14 @@ SafeBrowsingService::url_request_context() {
   return url_request_context_getter_;
 }
 
+void SafeBrowsingService::DisableQuicOnIOThread() {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  url_request_context_getter_->DisableQuicOnIOThread();
+}
+
+// TODO(ntfschr): componentize this once BaseSafeBrowsingUIManager contains a

[Nathan Parker, 2017/01/09 20:00:21]

This looks like a merge confusion.

[pmarko, 2017/01/09 20:25:23]

Good catch, removed.

+// SafeBrowsingService
 const scoped_refptr<SafeBrowsingUIManager>&
 SafeBrowsingService::ui_manager() const {
   return ui_manager_;