Merge revision 1445 changes:

- Fix AssertNoURLRequests due to pending proxy connections during shutdown (issue #1037).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1446 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-09-17 08:15:03 +00:00
parent 6d432b5fd5
commit aaa206f04d

View File

@ -70,6 +70,11 @@ CefURLRequestContextGetter::CefURLRequestContextGetter(
CefURLRequestContextGetter::~CefURLRequestContextGetter() {
CEF_REQUIRE_IOT();
STLDeleteElements(&url_request_context_proxies_);
// Delete the ProxyService object here so that any pending requests will be
// canceled before the associated URLRequestContext is destroyed in this
// object's destructor.
storage_->set_proxy_service(NULL);
}
net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {