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

net/proxy/multi_threaded_proxy_resolver.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/multi_threaded_proxy_resolver.h"
 
 #include "base/message_loop.h"
 #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"
 
 // TODO(eroman): Have the MultiThreadedProxyResolver clear its PAC script
 //               data when SetPacScript fails. That will reclaim memory when
 //               testing bogus scripts.
 
 namespace net {
 
@@ skipping 308 matching lines @@
 }
 
 void MultiThreadedProxyResolver::Executor::Destroy() {
   DCHECK(coordinator_);
 
   // Give the resolver an opportunity to shutdown from THIS THREAD before
   // joining on the resolver thread. This allows certain implementations
   // 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();
     // Orphan the job (since this executor may be deleted soon).
     outstanding_job_->set_executor(NULL);
   }
 
   // It is now safe to free the ProxyResolver, since all the tasks that
   // were using it on the resolver thread have completed.
@@ skipping 204 matching lines @@
     return;
 
   // Get the next job to process (FIFO). Transfer it from the pending queue
   // to the executor.
   scoped_refptr<Job> job = pending_jobs_.front();
   pending_jobs_.pop_front();
   executor->StartJob(job);
 }
 
 }  // namespace net