Delete webrtc/base/common.h

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc

Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
index 8b04d00d38e8316208fc8d892b7c963cc6a2069d..bf8df5c196961055cee47ad8fbd78b792f8af3f9 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
@@ -14,7 +14,6 @@
 
 #include <sstream>
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
@@ -223,12 +222,11 @@ RateCounterFilter::RateCounterFilter(PacketProcessorListener* listener,
       packets_per_second_stats_(),
       kbps_stats_(),
       start_plotting_time_ms_(0),
+#if BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
       flow_id_(flow_id),
+#endif
       name_(name),
-      algorithm_name_(algorithm_name) {
-          // Only used when compiling with BWE test logging enabled.
-          RTC_UNUSED(flow_id_);
-      }
+      algorithm_name_(algorithm_name) {}
 
 RateCounterFilter::RateCounterFilter(PacketProcessorListener* listener,
                                      const FlowIds& flow_ids,
@@ -238,7 +236,6 @@ RateCounterFilter::RateCounterFilter(PacketProcessorListener* listener,
       packets_per_second_stats_(),
       kbps_stats_(),
       start_plotting_time_ms_(0),
-      flow_id_(0),
       name_(name),
       algorithm_name_(algorithm_name) {
   // TODO(terelius): Appending the flow IDs to the algorithm name is a hack to
@@ -278,6 +275,7 @@ Stats<double> RateCounterFilter::GetBitrateStats() const {
 }
 
 void RateCounterFilter::Plot(int64_t timestamp_ms) {
+#if BWE_TEST_LOGGING_COMPILE_TIME_ENABLE

[stefan-webrtc, 2017/02/17 10:27:32]

I really would prefer a better option to this... Maybe what we should do is
change the plot logging to not use macros so that we can use a null
implementation.

Not for this CL though, but maybe you could add a TODO?

[nisse-webrtc, 2017/02/20 08:11:22]

I added a TODO, with your name on it.

   uint32_t plot_kbps = 0;
   if (timestamp_ms >= start_plotting_time_ms_) {
     plot_kbps = rate_counter_.bits_per_second() / 1000.0;
@@ -291,8 +289,7 @@ void RateCounterFilter::Plot(int64_t timestamp_ms) {
                                              timestamp_ms, plot_kbps, flow_id_,
                                              algorithm_name_);
   }
-
-  RTC_UNUSED(plot_kbps);
+#endif
 }
 
 void RateCounterFilter::RunFor(int64_t /*time_ms*/, Packets* in_out) {