rtc_stats: Update code to remove chromium style warnings suppression.

webrtc/stats/rtcstatsreport_unittest.cc

 /*
  *  Copyright 2016 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 "webrtc/api/stats/rtcstatsreport.h"
 
 #include "webrtc/api/stats/rtcstats.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/gunit.h"
 
 namespace webrtc {
 
 class RTCTestStats1 : public RTCStats {
  public:
+  WEBRTC_RTCSTATS_DECL();
+
   RTCTestStats1(const std::string& id, int64_t timestamp_us)
       : RTCStats(id, timestamp_us),
         integer("integer") {}
 
-  WEBRTC_RTCSTATS_IMPL(RTCStats, RTCTestStats1,
-      &integer);
-
   RTCStatsMember<int32_t> integer;
 };
 
-const char RTCTestStats1::kType[] = "test-stats-1";
+WEBRTC_RTCSTATS_IMPL(RTCTestStats1, RTCStats, "test-stats-1",
+    &integer);
 
 class RTCTestStats2 : public RTCStats {
  public:
+  WEBRTC_RTCSTATS_DECL();
+
   RTCTestStats2(const std::string& id, int64_t timestamp_us)
       : RTCStats(id, timestamp_us),
         number("number") {}
 
-  WEBRTC_RTCSTATS_IMPL(RTCStats, RTCTestStats2,
-      &number);
-
   RTCStatsMember<double> number;
 };
 
-const char RTCTestStats2::kType[] = "test-stats-2";
+WEBRTC_RTCSTATS_IMPL(RTCTestStats2, RTCStats, "test-stats-2",
+    &number);
 
 class RTCTestStats3 : public RTCStats {
  public:
+  WEBRTC_RTCSTATS_DECL();
+
   RTCTestStats3(const std::string& id, int64_t timestamp_us)
       : RTCStats(id, timestamp_us),
         string("string") {}
 
-  WEBRTC_RTCSTATS_IMPL(RTCStats, RTCTestStats3,
-      &string);
-
   RTCStatsMember<std::string> string;
 };
 
-const char RTCTestStats3::kType[] = "test-stats-3";
+WEBRTC_RTCSTATS_IMPL(RTCTestStats3, RTCStats, "test-stats-3",
+    &string);
 
 TEST(RTCStatsReport, AddAndGetStats) {
   rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create();
   EXPECT_EQ(report->size(), static_cast<size_t>(0));
   report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("a0", 1)));
   report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("a1", 2)));
   report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("b0", 4)));
   report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("b1", 8)));
   report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats1("a2", 16)));
   report->AddStats(std::unique_ptr<RTCStats>(new RTCTestStats2("b2", 32)));
@@ skipping 52 matching lines @@
   EXPECT_EQ(b->size(), static_cast<size_t>(0));
   int64_t i = 0;
   for (const RTCStats& stats : *a) {
     EXPECT_EQ(stats.timestamp_us(), i);
     ++i;
   }
   EXPECT_EQ(i, static_cast<int64_t>(6));
 }
 
 }  // namespace webrtc