From 032b802a8c7f7c153a38f66175371d3e0df5c52f Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Mon, 15 Dec 2014 09:48:07 +0000 Subject: [PATCH] (Auto)update libjingle 82121498-> 82126219 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7896 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/statstypes.cc | 5 ----- talk/app/webrtc/statstypes.h | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/talk/app/webrtc/statstypes.cc b/talk/app/webrtc/statstypes.cc index 0e67e700e3..8547520069 100644 --- a/talk/app/webrtc/statstypes.cc +++ b/talk/app/webrtc/statstypes.cc @@ -53,11 +53,6 @@ StatsReport::StatsReport(const std::string& id) : id(id), timestamp(0) { } -StatsReport::StatsReport(const std::string& id, - const StatsReport::StatsType& type) - : id(id), type(type), timestamp(0) { -} - StatsReport& StatsReport::operator=(const StatsReport& src) { ASSERT(id == src.id); type = src.type; diff --git a/talk/app/webrtc/statstypes.h b/talk/app/webrtc/statstypes.h index 732396cd19..d47dc18534 100644 --- a/talk/app/webrtc/statstypes.h +++ b/talk/app/webrtc/statstypes.h @@ -44,8 +44,9 @@ namespace webrtc { class StatsReport { public: - // TODO(tommi): Change this to be an enum. - typedef std::string StatsType; + // TODO(tommi): Remove this ctor after removing reliance upon it in Chromium + // (mock_peer_connection_impl.cc). + StatsReport() : timestamp(0) {} // TODO(tommi): Make protected and disallow copy completely once not needed. StatsReport(const StatsReport& src); @@ -53,7 +54,6 @@ class StatsReport { // Constructor is protected to force use of StatsSet. // TODO(tommi): Make this ctor protected. explicit StatsReport(const std::string& id); - StatsReport(const std::string& id, const StatsType& type); // TODO(tommi): Make this protected. StatsReport& operator=(const StatsReport& src); @@ -70,7 +70,7 @@ class StatsReport { // so it must never be changed. // TODO(tommi): Make this member variable const. std::string id; // See below for contents. - StatsType type; // See below for contents. + std::string type; // See below for contents. // StatsValue names. enum StatsValueName {