Delete webrtc/base/common.h

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h

 /*
  *  Copyright (c) 2013 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.
  */
 
@@ skipping 232 matching lines @@
 
   void LogStats();
   Stats<double> GetBitrateStats() const;
   virtual void Plot(int64_t timestamp_ms);
   virtual void RunFor(int64_t time_ms, Packets* in_out);
 
  private:
   Stats<double> packets_per_second_stats_;
   Stats<double> kbps_stats_;
   int64_t start_plotting_time_ms_;
-  int flow_id_;
+#if BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
+  int flow_id_ = 0;
+#endif

[pthatcher1, 2017/02/10 23:44:17]

I don't understand why BWE_TEST_LOGGING_COMPILE_TIME_ENABLE is part of this CL.

[kwiberg-webrtc, 2017/02/11 21:30:06]

I think it is because this variable is only used by code protected by #if
BWE_TEST_LOGGING_COMPILE_TIME_ENABLE; we used to avoid unused variable warnings
by calling RTC_UNUSED(flow_id_), but now we do it like this instead.

nisse@, please correct me if I'm wrong...

[nisse-webrtc, 2017/02/13 12:05:51]

You're right. Without these #ifdefs, I get warnings for unused variables, and
thanks to the use of -Werror, the warnings are fatal.

We could reintroduce RTC_UNUSED or something equivalent (an earlier patchset
used ATTRIBUTE_UNUSED at this location). But if the member variable is needed
only if BWE_... is true at compile time, I think it's good to make that
explicit.

It would perhaps be better to have the #ifdefs take out larger pieces of code,
preferably complete classes or complete files, but that's for some other cl.

   std::string name_;
   // Algorithm name if single flow, Total link utilization if all flows.
   std::string algorithm_name_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RateCounterFilter);
 };
 
 class LossFilter : public PacketProcessor {
  public:
   LossFilter(PacketProcessorListener* listener, int flow_id);
@@ skipping 199 matching lines @@
   uint32_t frame_counter_;
   int compensation_bytes_;
   int compensation_per_frame_;
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PeriodicKeyFrameSource);
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_