QUIC - clean up changes - fixed during merge with internal source code.

net/quic/congestion_control/cubic.cc

 // 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.
 
 #include "net/quic/congestion_control/cubic.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 // The following constants are in 2^10 fractions of a second instead of ms to
 // allow a 10 shift right to divide.
 const int kCubeScale = 40;  // 1024*1024^3 (first 1024 is from 0.100^3)
                             // where 0.100 is 100 ms which is the scaling
                             // round trip time.
 const int kCubeCongestionWindowScale = 410;
 const uint64 kCubeFactor = (GG_UINT64_C(1) << kCubeScale) /
     kCubeCongestionWindowScale;
 
 const uint32 kNumConnections = 2;
-const float kBeta = static_cast<float>(0.7);  // Default Cubic backoff factor.
+const float kBeta = 0.7f;  // Default Cubic backoff factor.
 // Additional backoff factor when loss occurs in the concave part of the Cubic
 // curve. This additional backoff factor is expected to give up bandwidth to
 // new concurrent flows and speed up convergence.
-const float kBetaLastMax = static_cast<float>(0.85);
+const float kBetaLastMax = 0.85f;
 
 // kNConnectionBeta is the backoff factor after loss for our N-connection
 // emulation, which emulates the effective backoff of an ensemble of N TCP-Reno
 // connections on a single loss event. The effective multiplier is computed as:
 const float kNConnectionBeta = (kNumConnections - 1 + kBeta) / kNumConnections;
 
 // TCPFriendly alpha is described in Section 3.3 of the CUBIC paper. Note that
 // kBeta here is a cwnd multiplier, and is equal to 1-beta from the CUBIC paper.
 // We derive the equivalent kNConnectionAlpha for an N-connection emulation as:
 const float kNConnectionAlpha = 3 * kNumConnections * kNumConnections *
@@ skipping 102 matching lines @@
   // Compute target congestion_window based on cubic target and estimated TCP
   // congestion_window, use highest (fastest).
   if (target_congestion_window < estimated_tcp_congestion_window_) {
     target_congestion_window = estimated_tcp_congestion_window_;
   }
   DVLOG(1) << "Target congestion_window:" << target_congestion_window;
   return target_congestion_window;
 }
 
 }  // namespace net