diff options
author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-26 07:56:10 +0000 |
---|---|---|
committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-26 07:56:10 +0000 |
commit | 23148c49803ecc5108de9dfdf9c86e4363d5d262 (patch) | |
tree | d2fc7ba11f605ebe9e4f63c4daa443f741acef11 /chrome/browser/chrome_plugin_host.cc | |
parent | 353e08bea34b776a5c79330ddba0749288556c35 (diff) | |
download | chromium_src-23148c49803ecc5108de9dfdf9c86e4363d5d262.zip chromium_src-23148c49803ecc5108de9dfdf9c86e4363d5d262.tar.gz chromium_src-23148c49803ecc5108de9dfdf9c86e4363d5d262.tar.bz2 |
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
Diffstat (limited to 'chrome/browser/chrome_plugin_host.cc')
-rw-r--r-- | chrome/browser/chrome_plugin_host.cc | 7 |
1 files changed, 6 insertions, 1 deletions
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; |