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

Unified Diff: net/proxy/multi_threaded_proxy_resolver.cc

Issue 6295005: Suppress a ThreadAssertion warning when joining worker thread for PAC scripts... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/multi_threaded_proxy_resolver.cc
===================================================================
--- net/proxy/multi_threaded_proxy_resolver.cc (revision 71199)
+++ net/proxy/multi_threaded_proxy_resolver.cc (working copy)
@@ -8,6 +8,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/threading/thread.h"
+#include "base/threading/thread_restrictions.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/proxy/proxy_info.h"
@@ -336,9 +337,14 @@
// to avoid deadlocks.
resolver_->Shutdown();
- // Join the worker thread.
- thread_.reset();
+ {
+ // See http://crbug.com/69710.
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+ // Join the worker thread.
+ thread_.reset();
+ }
+
// Cancel any outstanding job.
if (outstanding_job_) {
outstanding_job_->Cancel();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698