Cap the delay time for the main job when racing with QUIC for delayed

net/http/http_stream_factory_impl_job_controller.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_stream_factory_impl_job_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 10 matching lines @@
 #include "net/log/net_log_capture_mode.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_with_source.h"
 #include "net/proxy/proxy_server.h"
 #include "net/spdy/spdy_session.h"
 #include "url/url_constants.h"
 
 namespace net {
 
+// The max time to delay the main job if is delayed TCP case.

[Ryan Hamilton, 2017/02/15 22:26:55]

nit: // The maximum time to wait for the alternate job to complete before
resuming the main job.

[Zhongyi Shi, 2017/02/15 23:32:33]

Done.

+const base::TimeDelta kMaxDelayTimeForMainJob = base::TimeDelta::FromSeconds(3);

[Ryan Hamilton, 2017/02/15 22:26:55]

Alas, this is a static initializer which is prohibited in chrome. The only
global const objects we can have must be POD types. So perhaps:

const int kMaxDelayTimeForMainJobSecs = 3;

[Zhongyi Shi, 2017/02/15 23:32:33]

Done.

+
 std::unique_ptr<base::Value> NetLogJobControllerCallback(
     const GURL* url,
     bool is_preconnect,
     NetLogCaptureMode /* capture_mode */) {
   auto dict = base::MakeUnique<base::DictionaryValue>();
   dict->SetString("url", url->possibly_invalid_spec());
   dict->SetBoolean("is_preconnect", is_preconnect);
   return std::move(dict);
 }
 
@@ skipping 611 matching lines @@
   }
 }
 
 const NetLogWithSource* HttpStreamFactoryImpl::JobController::GetNetLog(
     Job* job) const {
   return &net_log_;
 }
 
 void HttpStreamFactoryImpl::JobController::MaybeSetWaitTimeForMainJob(
     const base::TimeDelta& delay) {
-  if (main_job_is_blocked_)
-    main_job_wait_time_ = delay;
+  if (main_job_is_blocked_) {
+    main_job_wait_time_ =
+        delay > kMaxDelayTimeForMainJob ? kMaxDelayTimeForMainJob : delay;

[Ryan Hamilton, 2017/02/15 22:26:55]

can you do:

main_job_wait_time_  = std::min(delay, kMaxDelayTimeForMainJob);

[Zhongyi Shi, 2017/02/15 23:32:33]

Done.

+  }
 }
 
 bool HttpStreamFactoryImpl::JobController::HasPendingMainJob() const {
   return main_job_.get() != nullptr;
 }
 
 bool HttpStreamFactoryImpl::JobController::HasPendingAltJob() const {
   return alternative_job_.get() != nullptr;
 }
 
@@ skipping 489 matching lines @@
     return;
   DCHECK(alternative_job_->alternative_proxy_server().is_valid());
   alternative_job_->Start(request_->stream_type());
 }
 
 bool HttpStreamFactoryImpl::JobController::IsJobOrphaned(Job* job) const {
   return !request_ || (job_bound_ && bound_job_ != job);
 }
 
 }  // namespace net