Landing Recent QUIC changes until 5:55 PM, Aug 25, 2016 UTC-4

net/quic/core/quic_bandwidth.h

 // Copyright (c) 2012 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.
 //
 // QuicBandwidth represents a bandwidth, stored in bits per second resolution.
 
 #ifndef NET_QUIC_QUIC_BANDWIDTH_H_
 #define NET_QUIC_QUIC_BANDWIDTH_H_
 
 #include <stdint.h>
 
+#include <cmath>
 #include <ostream>
 
 #include "base/compiler_specific.h"
 #include "net/quic/core/quic_time.h"
 
 namespace net {
 
 typedef uint64_t QuicByteCount;
 typedef uint64_t QuicPacketCount;
 
@@ skipping 69 matching lines @@
 }
 
 // Non-member arithmetic operators for QuicBandwidth.
 inline QuicBandwidth operator+(QuicBandwidth lhs, QuicBandwidth rhs) {
   return QuicBandwidth(lhs.bits_per_second_ + rhs.bits_per_second_);
 }
 inline QuicBandwidth operator-(QuicBandwidth lhs, QuicBandwidth rhs) {
   return QuicBandwidth(lhs.bits_per_second_ - rhs.bits_per_second_);
 }
 inline QuicBandwidth operator*(QuicBandwidth lhs, float rhs) {
-  return QuicBandwidth(static_cast<int64_t>(lhs.bits_per_second_ * rhs));
+  return QuicBandwidth(
+      static_cast<int64_t>(std::llround(lhs.bits_per_second_ * rhs)));
 }
 inline QuicBandwidth operator*(float lhs, QuicBandwidth rhs) {
   return rhs * lhs;
 }
 
 // Override stream output operator for gtest.
 inline std::ostream& operator<<(std::ostream& output,
                                 const QuicBandwidth bandwidth) {
   output << bandwidth.ToDebugValue();
   return output;
 }
 
 }  // namespace net
 #endif  // NET_QUIC_QUIC_BANDWIDTH_H_