| Index: webrtc/modules/remote_bitrate_estimator/BUILD.gn
 | 
| diff --git a/webrtc/modules/remote_bitrate_estimator/BUILD.gn b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
 | 
| index c3c66eb801aded73e3aed0cc9f13b212e92c8d40..1e42ce9aa65f46e16260573ee2cc9179ae5353e2 100644
 | 
| --- a/webrtc/modules/remote_bitrate_estimator/BUILD.gn
 | 
| +++ b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
 | 
| @@ -8,11 +8,6 @@
 | 
|  
 | 
|  import("../../build/webrtc.gni")
 | 
|  
 | 
| -declare_args() {
 | 
| -  # Set this to true to enable BWE test logging.
 | 
| -  rtc_enable_bwe_test_logging = false
 | 
| -}
 | 
| -
 | 
|  rtc_source_set("remote_bitrate_estimator") {
 | 
|    sources = [
 | 
|      "aimd_rate_control.cc",
 | 
| @@ -39,11 +34,13 @@ rtc_source_set("remote_bitrate_estimator") {
 | 
|      "transport_feedback_adapter.h",
 | 
|    ]
 | 
|  
 | 
| -  if (rtc_enable_bwe_test_logging) {
 | 
| -    defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
 | 
| -    sources += [ "test/bwe_test_logging.cc" ]
 | 
| -  } else {
 | 
| -    defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
 | 
| +  if (!rtc_include_tests) {
 | 
| +    if (rtc_enable_bwe_test_logging) {
 | 
| +      defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
 | 
| +      sources += [ "test/bwe_test_logging.cc" ]
 | 
| +    } else {
 | 
| +      defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
 | 
| +    }
 | 
|    }
 | 
|  
 | 
|    if (is_clang) {
 | 
| @@ -62,6 +59,7 @@ if (rtc_include_tests) {
 | 
|    rtc_source_set("bwe_simulator") {
 | 
|      testonly = true
 | 
|      sources = [
 | 
| +      "bwe_simulations.cc",
 | 
|        "test/bwe.cc",
 | 
|        "test/bwe.h",
 | 
|        "test/bwe_test.cc",
 | 
| 
 |