Add a default implementation in metrics_default.cc of histograms methods in system_wrappers/interfac

webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc

 /*
  *  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.
  */
 
 #include <memory>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "vpx/vpx_encoder.h"
 #include "vpx/vp8cx.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
 #include "webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/test/histogram.h"
+#include "webrtc/system_wrappers/include/metrics_default.h"
 
 using ::testing::_;
 using ::testing::NiceMock;
 using ::testing::Return;
 
 namespace webrtc {
 
 // 5 frames per second at 90 kHz.
 const uint32_t kTimestampDelta5Fps = 90000 / 5;
 const int kDefaultQp = 54;
@@ skipping 434 matching lines @@
             kStartTimestamp + (ScreenshareLayers::kMaxFrameIntervalMs * 90));
 
   EXPECT_EQ(-1, layers_->EncodeFlags(kTwoSecondsLater));
   // More than two seconds has passed since last frame, one should be emitted
   // even if bitrate target is then exceeded.
   EXPECT_EQ(ScreenshareLayers::kTl0Flags,
             layers_->EncodeFlags(kTwoSecondsLater + 90));
 }
 
 TEST_F(ScreenshareLayerTest, UpdatesHistograms) {
+  metrics::Reset();
   ConfigureBitrates();
   vpx_codec_enc_cfg_t cfg = GetConfig();
   bool trigger_drop = false;
   bool dropped_frame = false;
   bool overshoot = false;
   const int kTl0Qp = 35;
   const int kTl1Qp = 30;
   for (int64_t timestamp = 0;
        timestamp < kTimestampDelta5Fps * 5 * metrics::kMinRunTimeInSeconds;
        timestamp += kTimestampDelta5Fps) {
@@ skipping 25 matching lines @@
       RTC_NOTREACHED() << "Unexpected flags";
     }
     clock_.AdvanceTimeMilliseconds(1000 / 5);
   }
 
   EXPECT_TRUE(overshoot);
   EXPECT_TRUE(dropped_frame);
 
   layers_.reset();  // Histograms are reported on destruction.
 
-  EXPECT_EQ(1, test::NumHistogramSamples(
-                   "WebRTC.Video.Screenshare.Layer0.FrameRate"));
-  EXPECT_EQ(1, test::NumHistogramSamples(
-                   "WebRTC.Video.Screenshare.Layer1.FrameRate"));
+  EXPECT_EQ(1,
+            metrics::NumSamples("WebRTC.Video.Screenshare.Layer0.FrameRate"));
+  EXPECT_EQ(1,
+            metrics::NumSamples("WebRTC.Video.Screenshare.Layer1.FrameRate"));
+  EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.Screenshare.FramesPerDrop"));
+  EXPECT_EQ(1,
+            metrics::NumSamples("WebRTC.Video.Screenshare.FramesPerOvershoot"));
+  EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.Screenshare.Layer0.Qp"));
+  EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.Screenshare.Layer1.Qp"));
   EXPECT_EQ(
-      1, test::NumHistogramSamples("WebRTC.Video.Screenshare.FramesPerDrop"));
-  EXPECT_EQ(1, test::NumHistogramSamples(
-                   "WebRTC.Video.Screenshare.FramesPerOvershoot"));
-  EXPECT_EQ(1, test::NumHistogramSamples("WebRTC.Video.Screenshare.Layer0.Qp"));
-  EXPECT_EQ(1, test::NumHistogramSamples("WebRTC.Video.Screenshare.Layer1.Qp"));
-  EXPECT_EQ(1, test::NumHistogramSamples(
-                   "WebRTC.Video.Screenshare.Layer0.TargetBitrate"));
-  EXPECT_EQ(1, test::NumHistogramSamples(
-                   "WebRTC.Video.Screenshare.Layer1.TargetBitrate"));
+      1, metrics::NumSamples("WebRTC.Video.Screenshare.Layer0.TargetBitrate"));
+  EXPECT_EQ(
+      1, metrics::NumSamples("WebRTC.Video.Screenshare.Layer1.TargetBitrate"));
 
-  EXPECT_GT(
-      test::LastHistogramSample("WebRTC.Video.Screenshare.Layer0.FrameRate"),
-      1);
-  EXPECT_GT(
-      test::LastHistogramSample("WebRTC.Video.Screenshare.Layer1.FrameRate"),
-      1);
-  EXPECT_GT(test::LastHistogramSample("WebRTC.Video.Screenshare.FramesPerDrop"),
+  EXPECT_GT(metrics::MinSample("WebRTC.Video.Screenshare.Layer0.FrameRate"), 1);
+  EXPECT_GT(metrics::MinSample("WebRTC.Video.Screenshare.Layer1.FrameRate"), 1);
+  EXPECT_GT(metrics::MinSample("WebRTC.Video.Screenshare.FramesPerDrop"), 1);
+  EXPECT_GT(metrics::MinSample("WebRTC.Video.Screenshare.FramesPerOvershoot"),
             1);
-  EXPECT_GT(
-      test::LastHistogramSample("WebRTC.Video.Screenshare.FramesPerOvershoot"),
-      1);
-  EXPECT_EQ(kTl0Qp,
-            test::LastHistogramSample("WebRTC.Video.Screenshare.Layer0.Qp"));
-  EXPECT_EQ(kTl1Qp,
-            test::LastHistogramSample("WebRTC.Video.Screenshare.Layer1.Qp"));
-  EXPECT_EQ(kDefaultTl0BitrateKbps,
-            test::LastHistogramSample(
-                "WebRTC.Video.Screenshare.Layer0.TargetBitrate"));
-  EXPECT_EQ(kDefaultTl1BitrateKbps,
-            test::LastHistogramSample(
-                "WebRTC.Video.Screenshare.Layer1.TargetBitrate"));
+  EXPECT_EQ(1,
+            metrics::NumEvents("WebRTC.Video.Screenshare.Layer0.Qp", kTl0Qp));
+  EXPECT_EQ(1,
+            metrics::NumEvents("WebRTC.Video.Screenshare.Layer1.Qp", kTl1Qp));
+  EXPECT_EQ(1,
+            metrics::NumEvents("WebRTC.Video.Screenshare.Layer0.TargetBitrate",
+                               kDefaultTl0BitrateKbps));
+  EXPECT_EQ(1,
+            metrics::NumEvents("WebRTC.Video.Screenshare.Layer1.TargetBitrate",
+                               kDefaultTl1BitrateKbps));
 }
 
 }  // namespace webrtc