Move BitrateAllocator from BitrateController logic to Call.

webrtc/call/bitrate_allocator_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <algorithm>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h"
+#include "webrtc/call/bitrate_allocator.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 
 namespace webrtc {
 
 class TestBitrateObserver : public BitrateObserver {
  public:
   TestBitrateObserver()
       : last_bitrate_(0), last_fraction_loss_(0), last_rtt_(0) {}
 
   virtual void OnNetworkChanged(uint32_t bitrate,
@@ skipping 20 matching lines @@
 
 TEST_F(BitrateAllocatorTest, UpdatingBitrateObserver) {
   TestBitrateObserver bitrate_observer;
   int start_bitrate =
       allocator_->AddBitrateObserver(&bitrate_observer, 100000, 1500000);
   EXPECT_EQ(300000, start_bitrate);
   allocator_->OnNetworkChanged(200000, 0, 0);
   EXPECT_EQ(200000u, bitrate_observer.last_bitrate_);
 
   // TODO(pbos): Expect capping to 1.5M instead of 3M when not boosting the max
-  // bitrate for FEC/retransmissions (see TODO in BitrateAllocator).
+  // bitrate for FEC/retransmissions (see todo in BitrateAllocator).
   allocator_->OnNetworkChanged(4000000, 0, 0);
   EXPECT_EQ(3000000u, bitrate_observer.last_bitrate_);
   start_bitrate =
       allocator_->AddBitrateObserver(&bitrate_observer, 100000, 4000000);
   EXPECT_EQ(4000000, start_bitrate);
 
   start_bitrate =
       allocator_->AddBitrateObserver(&bitrate_observer, 100000, 1500000);
   EXPECT_EQ(3000000, start_bitrate);
   EXPECT_EQ(3000000u, bitrate_observer.last_bitrate_);
@@ skipping 136 matching lines @@
   allocator_->OnNetworkChanged(1000, 0, 0);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_);  // Min cap.
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_);  // Min cap.
   EXPECT_EQ(300000u, bitrate_observer_3.last_bitrate_);  // Min cap.
 
   allocator_->RemoveBitrateObserver(&bitrate_observer_1);
   allocator_->RemoveBitrateObserver(&bitrate_observer_2);
   allocator_->RemoveBitrateObserver(&bitrate_observer_3);
 }
 }  // namespace webrtc