summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2015-04-13 20:40:50 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-14 03:41:16 +0000
commiteb49ae532e7b2595cfaec8a668f3705ab52733a7 (patch)
tree101f529904c7ea6f8ede0dca0a71e02a033e410c /google_apis
parent9509ec80cf8430372ea985e57461c317c945be9b (diff)
downloadchromium_src-eb49ae532e7b2595cfaec8a668f3705ab52733a7.zip
chromium_src-eb49ae532e7b2595cfaec8a668f3705ab52733a7.tar.gz
chromium_src-eb49ae532e7b2595cfaec8a668f3705ab52733a7.tar.bz2
Update instrumentation for various functions janky on the Mac IO thread.
BUG=455469,458404,457528,457525,455884,454983 TEST=none TBR=zea,mmenke,jochen Review URL: https://codereview.chromium.org/1062683005 Cr-Commit-Position: refs/heads/master@{#324995}
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gcm/engine/connection_factory_impl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/google_apis/gcm/engine/connection_factory_impl.cc b/google_apis/gcm/engine/connection_factory_impl.cc
index 5be2eb6..ec2fdea 100644
--- a/google_apis/gcm/engine/connection_factory_impl.cc
+++ b/google_apis/gcm/engine/connection_factory_impl.cc
@@ -7,6 +7,7 @@
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/metrics/sparse_histogram.h"
+#include "base/profiler/scoped_tracker.h"
#include "google_apis/gcm/engine/connection_handler_impl.h"
#include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
#include "google_apis/gcm/protocol/mcs.pb.h"
@@ -349,6 +350,10 @@ base::TimeTicks ConnectionFactoryImpl::NowTicks() {
}
void ConnectionFactoryImpl::OnConnectDone(int result) {
+ // TODO(pkasting): Remove ScopedTracker below once crbug.com/455884 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "455884 ConnectionFactoryImpl::OnConnectDone"));
if (result != net::OK) {
// If the connection fails, try another proxy.
result = ReconsiderProxyAfterError(result);