From 23148c49803ecc5108de9dfdf9c86e4363d5d262 Mon Sep 17 00:00:00 2001 From: "darin@google.com" Date: Tue, 26 Aug 2008 07:56:10 +0000 Subject: Disable the interceptor DCHECK that we are only called from a single thread. Given recent changes, the unit tests now make URLRequest calls from multiple threads but not simultaneously. See TestServer::MakeGETRequest. I think the interceptor list needs to be stored on the URLRequestContext or it needs to be made thread safe. TBR=mpcomplete git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1373 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chrome_plugin_host.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index f9a54ea..80180a6 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -89,7 +89,12 @@ class PluginRequestInterceptor // URLRequest::Interceptor virtual URLRequestJob* MaybeIntercept(URLRequest* request) { - DCHECK(CalledOnValidThread()); + // TODO(darin): This DCHECK fails in the unit tests because our interceptor + // is being persisted across unit tests. As a result, each time we get + // poked on a different thread, but never from more than one thread at a + // time. We need a way to have the URLRequestJobManager get reset between + // unit tests. + //DCHECK(CalledOnValidThread()); if (!IsHandledProtocol(request->url().scheme())) return NULL; -- cgit v1.1