rtc_stats: Update code to remove chromium style warnings suppression.

webrtc/stats/rtcstats_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/rtcstats.h"
 
 #include <cstring>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/stats/test/rtcteststats.h"
 
 namespace webrtc {
 
 class RTCChildStats : public RTCStats {
  public:
+  WEBRTC_RTCSTATS_DECL();
+
   RTCChildStats(const std::string& id, int64_t timestamp_us)
       : RTCStats(id, timestamp_us),
         child_int("childInt") {}
 
-  WEBRTC_RTCSTATS_IMPL(RTCStats, RTCChildStats,
-      &child_int);
-
   RTCStatsMember<int32_t> child_int;
 };
 
-const char RTCChildStats::kType[] = "child-stats";
+WEBRTC_RTCSTATS_IMPL(RTCChildStats, RTCStats, "child-stats",
+    &child_int);
 
 class RTCGrandChildStats : public RTCChildStats {
  public:
+  WEBRTC_RTCSTATS_DECL();
+
   RTCGrandChildStats(const std::string& id, int64_t timestamp_us)
       : RTCChildStats(id, timestamp_us),
         grandchild_int("grandchildInt") {}
 
-  WEBRTC_RTCSTATS_IMPL(RTCChildStats, RTCGrandChildStats,
-      &grandchild_int);
-
   RTCStatsMember<int32_t> grandchild_int;
 };
 
-const char RTCGrandChildStats::kType[] = "grandchild-stats";
+WEBRTC_RTCSTATS_IMPL(RTCGrandChildStats, RTCChildStats, "grandchild-stats",
+      &grandchild_int);
 
 TEST(RTCStatsTest, RTCStatsAndMembers) {
   RTCTestStats stats("testId", 42);
   EXPECT_EQ(stats.id(), "testId");
   EXPECT_EQ(stats.timestamp_us(), static_cast<int64_t>(42));
   std::vector<const RTCStatsMemberInterface*> members = stats.Members();
   EXPECT_EQ(members.size(), static_cast<size_t>(14));
   for (const RTCStatsMemberInterface* member : members) {
     EXPECT_FALSE(member->is_defined());
   }
@@ skipping 83 matching lines @@
 }
 
 TEST(RTCStatsDeathTest, InvalidCasting) {
   RTCGrandChildStats stats("grandchild", 0.0);
   EXPECT_DEATH(stats.cast_to<RTCChildStats>(), "");
 }
 
 #endif  // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 }  // namespace webrtc