Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: net/socket/ssl_client_socket_nss.h

Issue 6474027: In Dev build, we would like to see if SSLClientSocketNSS object... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.h
===================================================================
--- net/socket/ssl_client_socket_nss.h (revision 74087)
+++ net/socket/ssl_client_socket_nss.h (working copy)
@@ -15,6 +15,8 @@
#include <vector>
#include "base/scoped_ptr.h"
+#include "base/synchronization/lock.h"
+#include "base/threading/platform_thread.h"
#include "base/time.h"
#include "base/timer.h"
#include "net/base/cert_verify_result.h"
@@ -165,6 +167,11 @@
// argument.
static void HandshakeCallback(PRFileDesc* socket, void* arg);
+ // The following methods are for debugging bug 65948. Will remove this code
+ // after fixing bug 65948.
+ void EnsureThreadIdAssigned() const;
+ bool CalledOnValidThread() const;
+
CompletionCallbackImpl<SSLClientSocketNSS> buffer_send_callback_;
CompletionCallbackImpl<SSLClientSocketNSS> buffer_recv_callback_;
bool transport_send_busy_;
@@ -262,6 +269,14 @@
scoped_ptr<SSLHostInfo> ssl_host_info_;
DnsCertProvenanceChecker* const dns_cert_checker_;
+
+ // The following two variables are added for debugging bug 65948. Will
+ // remove this code after fixing bug 65948.
+ // Added the following code Debugging in release mode.
+ mutable base::Lock lock_;
+ // This is mutable so that CalledOnValidThread can set it.
+ // It's guarded by |lock_|.
+ mutable base::PlatformThreadId valid_thread_id_;
};
} // namespace net
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698