Supporting Pause/Resume, Sending Estimate logging. Corrected plot colors

webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h

Index: webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h b/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h
index 13a76cc6d1481239f1d9caa52885d332882f0b5c..2be13e0b0b7249ef90f65e739580247922d43931 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h
@@ -11,18 +11,21 @@
 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_
 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_METRIC_RECORDER_H_
 
+#include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/common.h"
 #include "webrtc/test/testsupport/gtest_prod_util.h"
-#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
 
 namespace webrtc {
 namespace testing {
 namespace bwe {
 
+class ChokeFilter;
+class PacketSender;
+
 class LinkShare {
  public:
   explicit LinkShare(ChokeFilter* choke_filter);
@@ -79,9 +82,10 @@ class MetricRecorder {
   void PlotDynamics(int metric);
   void PlotAllDynamics();
 
-  void UpdateTime(int64_t time_ms);
+  void UpdateTimeMs(int64_t time_ms);
   void UpdateThroughput(int64_t bitrate_kbps, size_t payload_size);
-  void UpdateDelay(int64_t delay_ms);
+  void UpdateSendingEstimateKbps(int64_t bitrate_kbps);
+  void UpdateDelayMs(int64_t delay_ms);
   void UpdateLoss(float loss_ratio);
   void UpdateObjective();
 
@@ -146,6 +150,7 @@ class MetricRecorder {
 
   enum Metrics {
     kThroughput = 0,
+    kSendingEstimate,
     kDelay,
     kLoss,
     kObjective,
@@ -156,7 +161,6 @@ class MetricRecorder {
 
   std::string algorithm_name_;
   int flow_id_;
-  PacketSender* packet_sender_;
   LinkShare* link_share_;
 
   int64_t now_ms_;