summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/v2_authenticator_unittest.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 22:08:52 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 22:08:52 +0000
commit5399828968478f2f269444622256d06e004de342 (patch)
treeb2e07fa11abb5ca6584e989f6e773896ceee561a /remoting/protocol/v2_authenticator_unittest.cc
parentff67f93885fa2e0be633959c7e5c1095ae537789 (diff)
downloadchromium_src-5399828968478f2f269444622256d06e004de342.zip
chromium_src-5399828968478f2f269444622256d06e004de342.tar.gz
chromium_src-5399828968478f2f269444622256d06e004de342.tar.bz2
Revert 140846 - (relanding r140697)
Move the core state machine of SSLClientSocketNSS into a thread-safe Core NSS SSL functions may block on the underlying PKCS#11 modules or on user input. On ChromeOS, which has a hardware TPM, calls may take upwards of several seconds, preventing any IPC due to the I/O thread being blocked. To avoid blocking the I/O thread on ChromeOS, move the core SSL implementation to a dedicated worker thread, so that only SSL sockets are blocked. BUG=122355 TEST=existing net_unittests + see bug. Review URL: https://chromiumcodereview.appspot.com/10454066 TBR=rsleevi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10546033 TBR=rsleevi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10543036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/v2_authenticator_unittest.cc')
-rw-r--r--remoting/protocol/v2_authenticator_unittest.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/remoting/protocol/v2_authenticator_unittest.cc b/remoting/protocol/v2_authenticator_unittest.cc
index 0d634e4..dc95318 100644
--- a/remoting/protocol/v2_authenticator_unittest.cc
+++ b/remoting/protocol/v2_authenticator_unittest.cc
@@ -61,9 +61,6 @@ TEST_F(V2AuthenticatorTest, SuccessfulAuth) {
host_auth_ = host_->CreateChannelAuthenticator();
RunChannelAuth(false);
- EXPECT_TRUE(client_socket_.get() != NULL);
- EXPECT_TRUE(host_socket_.get() != NULL);
-
StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
kMessageSize, kMessages);