Add AssertNoURLRequests() to URLRequestContext subclass destructors.

BUG=377852

Review URL: https://codereview.chromium.org/379293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284556 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/io_thread.cc

@@ -162,6 +162,7 @@ class SystemURLRequestContext : public net::URLRequestContext {
 
  private:
   virtual ~SystemURLRequestContext() {
+    AssertNoURLRequests();
 #if defined(USE_NSS) || defined(OS_IOS)
     net::SetURLRequestContextForNSSHttpIO(NULL);
 #endif

chrome/browser/net/chrome_url_request_context.cc

@@ -268,6 +268,7 @@ ChromeURLRequestContext::ChromeURLRequestContext()
 
 ChromeURLRequestContext::~ChromeURLRequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  AssertNoURLRequests();
 }
 
 void ChromeURLRequestContext::CopyFrom(ChromeURLRequestContext* other) {

chrome/browser/net/connection_tester.cc

@@ -59,7 +59,9 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
         storage_(this),
         weak_factory_(this) {}
 
-  virtual ~ExperimentURLRequestContext() {}
+  virtual ~ExperimentURLRequestContext() {
+    AssertNoURLRequests();
+  }
 
   // Creates a proxy config service for |experiment|. On success returns net::OK
   // and fills |config_service| with a new pointer. Otherwise returns a network

chrome/browser/profiles/profile_io_data.cc

@@ -537,7 +537,9 @@ void ProfileIOData::MediaRequestContext::SetHttpTransactionFactory(
   set_http_transaction_factory(http_factory_.get());
 }
 
-ProfileIOData::MediaRequestContext::~MediaRequestContext() {}
+ProfileIOData::MediaRequestContext::~MediaRequestContext() {
+  AssertNoURLRequests();
+}
 
 ProfileIOData::AppRequestContext::AppRequestContext() {
 }
@@ -560,7 +562,9 @@ void ProfileIOData::AppRequestContext::SetJobFactory(
   set_job_factory(job_factory_.get());
 }
 
-ProfileIOData::AppRequestContext::~AppRequestContext() {}
+ProfileIOData::AppRequestContext::~AppRequestContext() {
+  AssertNoURLRequests();
+}
 
 ProfileIOData::ProfileParams::ProfileParams()
     : io_thread(NULL),

chrome/test/base/testing_profile.cc

@@ -138,7 +138,9 @@ class TestExtensionURLRequestContext : public net::URLRequestContext {
     set_cookie_store(cookie_monster);
   }
 
-  virtual ~TestExtensionURLRequestContext() {}
+  virtual ~TestExtensionURLRequestContext() {
+    AssertNoURLRequests();
+  }
 };
 
 class TestExtensionURLRequestContextGetter

content/public/test/mock_blob_url_request_context.cc

@@ -24,6 +24,7 @@ MockBlobURLRequestContext::MockBlobURLRequestContext(
 }
 
 MockBlobURLRequestContext::~MockBlobURLRequestContext() {
+  AssertNoURLRequests();
 }
 
 ScopedTextBlob::ScopedTextBlob(

net/proxy/proxy_script_fetcher_impl_unittest.cc

@@ -85,6 +85,7 @@ class RequestContext : public URLRequestContext {
   }
 
   virtual ~RequestContext() {
+    AssertNoURLRequests();
   }
 
  private:

net/spdy/spdy_test_util_common.cc

@@ -501,6 +501,7 @@ SpdyURLRequestContext::SpdyURLRequestContext(NextProto protocol,
 }
 
 SpdyURLRequestContext::~SpdyURLRequestContext() {
+  AssertNoURLRequests();
 }
 
 bool HasSpdySession(SpdySessionPool* pool, const SpdySessionKey& key) {

net/url_request/url_request_context.h

@@ -199,6 +199,9 @@ class NET_EXPORT URLRequestContext
     return url_requests_.get();
   }
 
+  // CHECKs that no URLRequests using this context remain. Subclasses should
+  // additionally call AssertNoURLRequests() within their own destructor,
+  // prior to implicit destruction of subclass-owned state.
   void AssertNoURLRequests() const;
 
   // Get the underlying |HttpUserAgentSettings| implementation that provides

net/url_request/url_request_context_builder.cc

@@ -165,7 +165,9 @@ class BasicURLRequestContext : public URLRequestContext {
   }
 
  protected:
-  virtual ~BasicURLRequestContext() {}
+  virtual ~BasicURLRequestContext() {
+    AssertNoURLRequests();
+  }
 
  private:
   // Threads should be torn down last.

net/url_request/url_request_test_util.cc

@@ -61,6 +61,7 @@ TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
 
 TestURLRequestContext::~TestURLRequestContext() {
   DCHECK(initialized_);
+  AssertNoURLRequests();
 }
 
 void TestURLRequestContext::Init() {

net/url_request/view_cache_helper_unittest.cc

@@ -20,7 +20,10 @@ namespace {
 class TestURLRequestContext : public URLRequestContext {
  public:
   TestURLRequestContext();
-  virtual ~TestURLRequestContext() {}
+
+  virtual ~TestURLRequestContext() {
+    AssertNoURLRequests();
+  }
 
   // Gets a pointer to the cache backend.
   disk_cache::Backend* GetBackend();

net/websockets/websocket_job_test.cc

@@ -266,7 +266,9 @@ class MockURLRequestContext : public URLRequestContext {
                                       include_subdomains);
   }
 
-  virtual ~MockURLRequestContext() {}
+  virtual ~MockURLRequestContext() {
+    AssertNoURLRequests();
+  }
 
  private:
   TransportSecurityState transport_security_state_;

sync/internal_api/http_bridge.cc

@@ -167,6 +167,7 @@ HttpBridge::RequestContext::RequestContext(
 }
 
 HttpBridge::RequestContext::~RequestContext() {
+  AssertNoURLRequests();
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   delete http_transaction_factory();
 }