diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:13:19 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:13:19 +0000 |
| commit | 5bab49ecbba6a218d848c1f03ab2eb9f828a18bd (patch) | |
| tree | cd7b5f09c86c204e5c192ed778647ff673722bd4 /content | |
| parent | 0a1e9ad53f2f7f2fc6139644da122e272b88fb80 (diff) | |
| download | chromium_src-5bab49ecbba6a218d848c1f03ab2eb9f828a18bd.zip chromium_src-5bab49ecbba6a218d848c1f03ab2eb9f828a18bd.tar.gz chromium_src-5bab49ecbba6a218d848c1f03ab2eb9f828a18bd.tar.bz2 | |
Make ServerBoundCertService use TaskRunner interface instead of using WorkerPool directly.
Use SequencedWorkerPool for OriginBoundCertServiceTest. Should fix OriginBoundCertServiceTest.CancelRequest flake.
BUG=114726
TEST=trybots
Review URL: http://codereview.chromium.org/10005033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/shell_url_request_context_getter.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index 23da214..e0438a2 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/string_split.h" +#include "base/threading/worker_pool.h" #include "content/public/browser/browser_thread.h" #include "content/shell/shell_network_delegate.h" #include "net/base/cert_verifier.h" @@ -55,7 +56,8 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() { storage_.reset(new net::URLRequestContextStorage(url_request_context_)); storage_->set_cookie_store(new net::CookieMonster(NULL, NULL)); storage_->set_server_bound_cert_service(new net::ServerBoundCertService( - new net::DefaultServerBoundCertStore(NULL))); + new net::DefaultServerBoundCertStore(NULL), + base::WorkerPool::GetTaskRunner(true))); url_request_context_->set_accept_language("en-us,en"); url_request_context_->set_accept_charset("iso-8859-1,*,utf-8"); |