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

Unified Diff: net/quic/quic_stream_factory.cc

Issue 816543004: Update from https://crrev.com/308996 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « net/quic/quic_session.cc ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_stream_factory.cc
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index ecd338aaa80e8f9993776d42bfd2efb1ef99698b..45c60c091f0498759d63493db93aff19ab95bd50 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -317,6 +317,11 @@ void QuicStreamFactory::Job::CancelWaitForDataReadyCallback() {
}
int QuicStreamFactory::Job::DoResolveHost() {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::DoResolveHost"));
+
// Start loading the data now, and wait for it after we resolve the host.
if (server_info_) {
server_info_->Start();
@@ -334,6 +339,11 @@ int QuicStreamFactory::Job::DoResolveHost() {
}
int QuicStreamFactory::Job::DoResolveHostComplete(int rv) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::DoResolveHostComplete"));
+
UMA_HISTOGRAM_TIMES("Net.QuicSession.HostResolutionTime",
base::TimeTicks::Now() - dns_resolution_start_time_);
if (rv != OK)
@@ -352,6 +362,11 @@ int QuicStreamFactory::Job::DoResolveHostComplete(int rv) {
}
int QuicStreamFactory::Job::DoLoadServerInfo() {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::DoLoadServerInfo"));
+
io_state_ = STATE_LOAD_SERVER_INFO_COMPLETE;
if (!server_info_)
@@ -375,6 +390,11 @@ int QuicStreamFactory::Job::DoLoadServerInfo() {
}
int QuicStreamFactory::Job::DoLoadServerInfoComplete(int rv) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::DoLoadServerInfoComplete"));
+
if (server_info_) {
UMA_HISTOGRAM_TIMES("Net.QuicServerInfo.DiskCacheWaitForDataReadyTime",
base::TimeTicks::Now() - disk_cache_load_start_time_);
@@ -389,6 +409,11 @@ int QuicStreamFactory::Job::DoLoadServerInfoComplete(int rv) {
}
int QuicStreamFactory::Job::DoConnect() {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::DoConnect"));
+
io_state_ = STATE_CONNECT_COMPLETE;
int rv = factory_->CreateSession(server_id_, server_info_.Pass(),
@@ -418,6 +443,11 @@ int QuicStreamFactory::Job::DoConnect() {
}
int QuicStreamFactory::Job::DoResumeConnect() {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::DoResumeConnect"));
+
io_state_ = STATE_CONNECT_COMPLETE;
int rv = session_->ResumeCryptoConnect(
@@ -428,6 +458,11 @@ int QuicStreamFactory::Job::DoResumeConnect() {
}
int QuicStreamFactory::Job::DoConnectComplete(int rv) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "422516 QuicStreamFactory::Job::DoConnectComplete"));
+
if (rv != OK)
return rv;
« no previous file with comments | « net/quic/quic_session.cc ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698