Revert of Fix simulator issue where chokes didn't apply to non-congested packets.

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi

 # Copyright (c) 2011 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.
 
 {
   'includes': [
@@ skipping 52 matching lines @@
             'test/bwe.cc',
             'test/bwe.h',
             'test/bwe_test.cc',
             'test/bwe_test.h',
             'test/bwe_test_baselinefile.cc',
             'test/bwe_test_baselinefile.h',
             'test/bwe_test_fileutils.cc',
             'test/bwe_test_fileutils.h',
             'test/bwe_test_framework.cc',
             'test/bwe_test_framework.h',
+            'test/bwe_test_framework_unittest.cc',
             'test/bwe_test_logging.cc',
             'test/bwe_test_logging.h',
             'test/packet_receiver.cc',
             'test/packet_receiver.h',
             'test/packet_sender.cc',
             'test/packet_sender.h',
             'test/packet.h',
             'test/random.cc',
             'test/random.h',
             'test/estimators/nada.cc',
             'test/estimators/nada.h',
+            'test/estimators/nada_unittest.cc',
             'test/estimators/remb.cc',
             'test/estimators/remb.h',
             'test/estimators/send_side.cc',
             'test/estimators/send_side.h',
             'test/estimators/tcp.cc',
             'test/estimators/tcp.h',
           ],
           'conditions': [
             ['enable_bwe_test_logging==1', {
               'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ],
@@ skipping 58 matching lines @@
             ],
           },
           'sources': [
             'tools/bwe_rtp_play.cc',
           ], # source
         },
       ],
     }],  # include_tests==1
   ],
 }