Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/quic_client_promised_info.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/quic/quic_client_promised_info.h"
 
 #include "base/logging.h"
 #include "net/quic/spdy_utils.h"
 
 using net::SpdyHeaderBlock;
@@ skipping 14 matching lines @@
 
 void QuicClientPromisedInfo::CleanupAlarm::OnAlarm() {
   DVLOG(1) << "self GC alarm for stream " << promised_->id_;
   promised_->Reset(QUIC_STREAM_CANCELLED);
 }
 
 void QuicClientPromisedInfo::Init() {
   cleanup_alarm_.reset(session_->connection()->alarm_factory()->CreateAlarm(
       new QuicClientPromisedInfo::CleanupAlarm(this)));
   cleanup_alarm_->Set(
-      session_->connection()->helper()->GetClock()->ApproximateNow().Add(
-          QuicTime::Delta::FromSeconds(kPushPromiseTimeoutSecs)));
+      session_->connection()->helper()->GetClock()->ApproximateNow() +
+      QuicTime::Delta::FromSeconds(kPushPromiseTimeoutSecs));
 }
 
 void QuicClientPromisedInfo::OnPromiseHeaders(const SpdyHeaderBlock& headers) {
   // RFC7540, Section 8.2, requests MUST be safe [RFC7231], Section
   // 4.2.1.  GET and HEAD are the methods that are safe and required.
   SpdyHeaderBlock::const_iterator it = headers.find(":method");
   DCHECK(it != headers.end());
   if (!(it->second == "GET" || it->second == "HEAD")) {
     DVLOG(1) << "Promise for stream " << id_ << " has invalid method "
              << it->second;
@@ skipping 67 matching lines @@
   return FinalValidation();
 }
 
 void QuicClientPromisedInfo::Cancel() {
   // Don't fire OnRendezvousResult() for client initiated cancel.
   client_request_delegate_ = nullptr;
   Reset(QUIC_STREAM_CANCELLED);
 }
 
 }  // namespace net