summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 21:13:19 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 21:13:19 +0000
commit5bab49ecbba6a218d848c1f03ab2eb9f828a18bd (patch)
treecd7b5f09c86c204e5c192ed778647ff673722bd4 /net/spdy
parent0a1e9ad53f2f7f2fc6139644da122e272b88fb80 (diff)
downloadchromium_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 'net/spdy')
-rw-r--r--net/spdy/spdy_http_stream_spdy3_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc
index 460215e..4307ddc 100644
--- a/net/spdy/spdy_http_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc
@@ -4,6 +4,7 @@
#include "net/spdy/spdy_http_stream.h"
+#include "base/threading/sequenced_worker_pool.h"
#include "crypto/ec_private_key.h"
#include "crypto/ec_signature_creator.h"
#include "crypto/signature_creator.h"
@@ -506,8 +507,11 @@ TEST_F(SpdyHttpStreamSpdy3Test, SendCredentialsEC) {
crypto::ECSignatureCreator::SetFactoryForTesting(
ec_signature_creator_factory.get());
+ scoped_refptr<base::SequencedWorkerPool> sequenced_worker_pool =
+ new base::SequencedWorkerPool(1, "SpdyHttpStreamSpdy3Test");
scoped_ptr<ServerBoundCertService> server_bound_cert_service(
- new ServerBoundCertService(new DefaultServerBoundCertStore(NULL)));
+ new ServerBoundCertService(new DefaultServerBoundCertStore(NULL),
+ sequenced_worker_pool));
std::string cert;
std::string proof;
GetECServerBoundCertAndProof("http://www.gmail.com/",
@@ -516,6 +520,8 @@ TEST_F(SpdyHttpStreamSpdy3Test, SendCredentialsEC) {
TestSendCredentials(server_bound_cert_service.get(), cert, proof,
CLIENT_CERT_ECDSA_SIGN);
+
+ sequenced_worker_pool->Shutdown();
}
#endif // !defined(USE_OPENSSL)