Landing Recent QUIC changes until Mon May 8 21:42:46 2017 +0000

net/quic/quartc/quartc_factory.cc

 // Copyright (c) 2017 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/quartc/quartc_factory.h"
 
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/platform/api/quic_socket_address.h"
 #include "net/quic/quartc/quartc_session.h"
 
@@ skipping 24 matching lines @@
     // Cancel it if already set.
     CancelImpl();
 
     int64_t delay_ms = (deadline() - (clock_->Now())).ToMilliseconds();
     if (delay_ms < 0) {
       delay_ms = 0;
     }
 
     DCHECK(task_runner_);
     DCHECK(!scheduled_task_);
-    scheduled_task_ = task_runner_->Schedule(this, delay_ms);
+    scheduled_task_.reset(task_runner_->Schedule(this, delay_ms).release());
   }
 
   void CancelImpl() override {
     if (scheduled_task_) {
       scheduled_task_->Cancel();
       scheduled_task_.reset();
     }
   }
 
   // QuartcTaskRunner::Task overrides.
@@ skipping 104 matching lines @@
   return &buffer_allocator_;
 }
 
 std::unique_ptr<QuartcFactoryInterface> CreateQuartcFactory(
     const QuartcFactoryConfig& factory_config) {
   return std::unique_ptr<QuartcFactoryInterface>(
       new QuartcFactory(factory_config));
 }
 
 }  // namespace net