From 58b4f1c43c17a8d4ca97d70f766d26dcd29faabd Mon Sep 17 00:00:00 2001 From: "mallinath@webrtc.org" Date: Mon, 24 Oct 2011 05:10:55 +0000 Subject: [PATCH] Fixes broken build in peerconnection unit tests Review URL: http://webrtc-codereview.appspot.com/244006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@799 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../source/talk/app/webrtc_dev/mediastream_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream_unittest.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream_unittest.cc index 2c39e9ad4b..e6e9740c45 100644 --- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream_unittest.cc +++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream_unittest.cc @@ -31,7 +31,7 @@ #include "gtest/gtest.h" #include "talk/app/webrtc_dev/mediastreamproxy.h" #include "talk/app/webrtc_dev/mediastreamtrackproxy.h" -#include "talk/app/webrtc_dev/ref_count.h" +#include "talk/app/webrtc_dev/refcount.h" #include "talk/base/scoped_ptr.h" #include "talk/base/thread.h" @@ -167,7 +167,7 @@ class MockMediaStreamTrack: public T { EXPECT_EQ(talk_base::Thread::Current(), signaling_thread_); track_impl_->UnregisterObserver(observer); } - virtual const char* kind() const { + virtual std::string kind() const { EXPECT_EQ(talk_base::Thread::Current(), signaling_thread_); return track_impl_->kind(); }