From 8faf9e047ee80b45d1a28d6c038cbd6e222f23cd Mon Sep 17 00:00:00 2001 From: hbos Date: Thu, 15 Sep 2016 06:52:43 -0700 Subject: [PATCH] Removed the const char* (StaticString) type from RTCStatsMember. std::string is all we need. const char* is an annoying special case because they can't be compared with ==. Having two different string types was a premature optimization. BUG=chromium:627816 NOTRY=True Review-Url: https://codereview.webrtc.org/2340303002 Cr-Commit-Position: refs/heads/master@{#14235} --- webrtc/api/rtcstats.h | 2 -- webrtc/stats/rtcstats.cc | 5 ----- webrtc/stats/rtcstats_unittest.cc | 21 ++------------------- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/webrtc/api/rtcstats.h b/webrtc/api/rtcstats.h index 1196e97373..e2cbf29c74 100644 --- a/webrtc/api/rtcstats.h +++ b/webrtc/api/rtcstats.h @@ -171,7 +171,6 @@ class RTCStatsMemberInterface { kInt64, // int64_t kUint64, // uint64_t kDouble, // double - kStaticString, // const char* kString, // std::string kSequenceInt32, // std::vector @@ -179,7 +178,6 @@ class RTCStatsMemberInterface { kSequenceInt64, // std::vector kSequenceUint64, // std::vector kSequenceDouble, // std::vector - kSequenceStaticString, // std::vector kSequenceString, // std::vector }; diff --git a/webrtc/stats/rtcstats.cc b/webrtc/stats/rtcstats.cc index 14ee7825d5..8fc0ebbc7f 100644 --- a/webrtc/stats/rtcstats.cc +++ b/webrtc/stats/rtcstats.cc @@ -103,8 +103,6 @@ WEBRTC_DEFINE_RTCSTATSMEMBER(uint64_t, kUint64, false, false, rtc::ToString(value_)); WEBRTC_DEFINE_RTCSTATSMEMBER(double, kDouble, false, false, rtc::ToString(value_)); -WEBRTC_DEFINE_RTCSTATSMEMBER(const char*, kStaticString, false, true, - value_); WEBRTC_DEFINE_RTCSTATSMEMBER(std::string, kString, false, true, value_); WEBRTC_DEFINE_RTCSTATSMEMBER( @@ -122,9 +120,6 @@ WEBRTC_DEFINE_RTCSTATSMEMBER( WEBRTC_DEFINE_RTCSTATSMEMBER( std::vector, kSequenceDouble, true, false, VectorToString(value_)); -WEBRTC_DEFINE_RTCSTATSMEMBER( - std::vector, kSequenceStaticString, true, false, - VectorOfStringsToString(value_)); WEBRTC_DEFINE_RTCSTATSMEMBER( std::vector, kSequenceString, true, false, VectorOfStringsToString(value_)); diff --git a/webrtc/stats/rtcstats_unittest.cc b/webrtc/stats/rtcstats_unittest.cc index f3b4209ea6..f6de8e607c 100644 --- a/webrtc/stats/rtcstats_unittest.cc +++ b/webrtc/stats/rtcstats_unittest.cc @@ -26,14 +26,12 @@ class RTCTestStats : public RTCStats { m_int64("mInt64"), m_uint64("mUint64"), m_double("mDouble"), - m_static_string("mStaticString"), m_string("mString"), m_sequence_int32("mSequenceInt32"), m_sequence_uint32("mSequenceUint32"), m_sequence_int64("mSequenceInt64"), m_sequence_uint64("mSequenceUint64"), m_sequence_double("mSequenceDouble"), - m_sequence_static_string("mSequenceStaticString"), m_sequence_string("mSequenceString") { } @@ -43,14 +41,12 @@ class RTCTestStats : public RTCStats { &m_int64, &m_uint64, &m_double, - &m_static_string, &m_string, &m_sequence_int32, &m_sequence_uint32, &m_sequence_int64, &m_sequence_uint64, &m_sequence_double, - &m_sequence_static_string, &m_sequence_string); RTCStatsMember m_int32; @@ -58,7 +54,6 @@ class RTCTestStats : public RTCStats { RTCStatsMember m_int64; RTCStatsMember m_uint64; RTCStatsMember m_double; - RTCStatsMember m_static_string; RTCStatsMember m_string; RTCStatsMember> m_sequence_int32; @@ -66,7 +61,6 @@ class RTCTestStats : public RTCStats { RTCStatsMember> m_sequence_int64; RTCStatsMember> m_sequence_uint64; RTCStatsMember> m_sequence_double; - RTCStatsMember> m_sequence_static_string; RTCStatsMember> m_sequence_string; }; @@ -105,7 +99,7 @@ TEST(RTCStatsTest, RTCStatsAndMembers) { EXPECT_EQ(stats.id(), "testId"); EXPECT_EQ(stats.timestamp_us(), static_cast(42)); std::vector members = stats.Members(); - EXPECT_EQ(members.size(), static_cast(14)); + EXPECT_EQ(members.size(), static_cast(12)); for (const RTCStatsMemberInterface* member : members) { EXPECT_FALSE(member->is_defined()); } @@ -114,7 +108,6 @@ TEST(RTCStatsTest, RTCStatsAndMembers) { stats.m_int64 = 123; stats.m_uint64 = 123; stats.m_double = 123.0; - stats.m_static_string = "123"; stats.m_string = std::string("123"); std::vector sequence_int32; @@ -127,10 +120,8 @@ TEST(RTCStatsTest, RTCStatsAndMembers) { sequence_uint64.push_back(static_cast(4)); std::vector sequence_double; sequence_double.push_back(5.0); - std::vector sequence_static_string; - sequence_static_string.push_back("six"); std::vector sequence_string; - sequence_string.push_back(std::string("seven")); + sequence_string.push_back(std::string("six")); stats.m_sequence_int32 = sequence_int32; stats.m_sequence_uint32 = sequence_uint32; @@ -138,7 +129,6 @@ TEST(RTCStatsTest, RTCStatsAndMembers) { stats.m_sequence_int64 = sequence_int64; stats.m_sequence_uint64 = sequence_uint64; stats.m_sequence_double = sequence_double; - stats.m_sequence_static_string = sequence_static_string; stats.m_sequence_string = sequence_string; for (const RTCStatsMemberInterface* member : members) { EXPECT_TRUE(member->is_defined()); @@ -148,19 +138,12 @@ TEST(RTCStatsTest, RTCStatsAndMembers) { EXPECT_EQ(*stats.m_int64, static_cast(123)); EXPECT_EQ(*stats.m_uint64, static_cast(123)); EXPECT_EQ(*stats.m_double, 123.0); - EXPECT_EQ(strcmp(*stats.m_static_string, "123"), 0); EXPECT_EQ(*stats.m_string, std::string("123")); EXPECT_EQ(*stats.m_sequence_int32, sequence_int32); EXPECT_EQ(*stats.m_sequence_uint32, sequence_uint32); EXPECT_EQ(*stats.m_sequence_int64, sequence_int64); EXPECT_EQ(*stats.m_sequence_uint64, sequence_uint64); EXPECT_EQ(*stats.m_sequence_double, sequence_double); - EXPECT_EQ(stats.m_sequence_static_string->size(), - sequence_static_string.size()); - for (size_t i = 0; i < sequence_static_string.size(); ++i) { - EXPECT_EQ(strcmp((*stats.m_sequence_static_string)[i], - sequence_static_string[i]), 0); - } EXPECT_EQ(*stats.m_sequence_string, sequence_string); int32_t numbers[] = { 4, 8, 15, 16, 23, 42 };