Suppress a ThreadAssertion warning when joining worker thread for PAC scripts...

Suppress a ThreadAssertion warning when joining worker thread for PAC scripts.
BUG=69710
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71540

[willchan no longer on Chromium, 2011-01-15 02:06:13]

LGTM

On Fri, Jan 14, 2011 at 2:23 PM, <eroman@chromium.org> wrote:

> Reviewers: willchan,
>
> Description:
> Suppress a ThreadAssertion warning when joining worker thread for PAC
> scripts.
> BUG=69710
>
> Please review this at http://codereview.chromium.org/6295005/
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
>  M     net/proxy/multi_threaded_proxy_resolver.cc
>
>
> 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();
>
>
>