diff options
| author | vadimt <vadimt@chromium.org> | 2014-11-06 19:19:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 03:20:05 +0000 |
| commit | bf84acec1a337df1a07519b4f2512becbbebdad6 (patch) | |
| tree | 27c648d74e1236e05caf47505be5e12e9051bf36 | |
| parent | 36d091feca1a3621430a61091ff2a527972a8e79 (diff) | |
| download | chromium_src-bf84acec1a337df1a07519b4f2512becbbebdad6.zip chromium_src-bf84acec1a337df1a07519b4f2512becbbebdad6.tar.gz chromium_src-bf84acec1a337df1a07519b4f2512becbbebdad6.tar.bz2 | |
Replacing 3 remaining profiler instrumentations using ScopedProfile with ScopedTracker.
There was a transition from ScopedProfile to ScopedTracker, but 3 instances of ScopedProfile were left, due to race conditions between CLs.
Landing as TBR because the changes is uber-trivial, safe, mechanical, other changes like this were landed, and we want to land this before M40 branchpoint.
BUG=401560
TBR=mmenke@chromium.org
Review URL: https://codereview.chromium.org/712523002
Cr-Commit-Position: refs/heads/master@{#303173}
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 31a9b8d..08cf2c5 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -1630,8 +1630,8 @@ void SSLClientSocketNSS::Core::HandshakeCallback( } void SSLClientSocketNSS::Core::HandshakeSucceeded() { - // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed. - tracked_objects::ScopedProfile tracking_profile( + // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed. + tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "424386 SSLClientSocketNSS::Core::HandshakeSucceeded")); @@ -1661,8 +1661,8 @@ void SSLClientSocketNSS::Core::HandshakeSucceeded() { } int SSLClientSocketNSS::Core::HandleNSSError(PRErrorCode nss_error) { - // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed. - tracked_objects::ScopedProfile tracking_profile( + // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed. + tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "424386 SSLClientSocketNSS::Core::HandleNSSError")); @@ -1813,8 +1813,8 @@ int SSLClientSocketNSS::Core::DoHandshake() { int net_error = OK; SECStatus rv = SSL_ForceHandshake(nss_fd_); - // TODO(vadimt): Remove ScopedProfile below once crbug.com/424386 is fixed. - tracked_objects::ScopedProfile tracking_profile1( + // TODO(vadimt): Remove ScopedTracker below once crbug.com/424386 is fixed. + tracked_objects::ScopedTracker tracking_profile1( FROM_HERE_WITH_EXPLICIT_FUNCTION( "424386 SSLClientSocketNSS::Core::DoHandshake 1")); |