kind() method in track interface is changed to std::string to keep uniformity with other get methods

Review URL: http://webrtc-codereview.appspot.com/242003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@793 4adac7df-926f-26a2-2b94-8c16560cd09d

7 files changed, 9 insertions, 9 deletions

diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.cc
index 1cce054f60..e87fc1bd33 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.cc
+++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.cc
@@ -49,8 +49,8 @@ AudioDeviceModule* AudioTrack::GetAudioDevice() {
 }
 
   // Implement MediaStreamTrack
-const char* AudioTrack::kind() const {
-  return kAudioTrackKind;
+std::string AudioTrack::kind() const {
+  return std::string(kAudioTrackKind);
 }
 
 talk_base::scoped_refptr<AudioTrack> AudioTrack::CreateRemote(
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.h
index 0caf1655c6..6c5f545ed9 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.h
+++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/audiotrackimpl.h
@@ -56,7 +56,7 @@ class AudioTrack : public MediaTrack<LocalAudioTrackInterface> {
   virtual AudioDeviceModule* GetAudioDevice();
 
   // Implement MediaStreamTrack
-  virtual const char* kind() const;
+  virtual std::string kind() const;
 
  protected:
   AudioTrack(const std::string& label, uint32 ssrc);
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream.h
index aa82b6ef71..94995f97c4 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream.h
+++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastream.h
@@ -78,7 +78,7 @@ class MediaStreamTrackInterface : public talk_base::RefCountInterface,
     kFailed = 3,  // Track negotiation failed.
   };
 
-  virtual const char* kind() const = 0;
+  virtual std::string kind() const = 0;
   virtual std::string label() const = 0;
   virtual uint32 ssrc() const = 0;
   virtual bool enabled() const = 0;
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.cc
index a56b64e884..200bd227d0 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.cc
+++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.cc
@@ -85,7 +85,7 @@ void MediaStreamTrackProxy<T>::Init(MediaStreamTrackInterface* track) {
 }
 
 template <class T>
-const char* MediaStreamTrackProxy<T>::kind() const {
+std::string MediaStreamTrackProxy<T>::kind() const {
   return track_->kind();
 }
 
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.h
index 8b0b4ffc57..d9f2c0cce8 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.h
+++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/mediastreamtrackproxy.h
@@ -48,7 +48,7 @@ class MediaStreamTrackProxy : public T,
   void Init(MediaStreamTrackInterface* track);
   // Implement MediaStreamTrack.
 
-  virtual const char* kind() const;
+  virtual std::string kind() const;
   virtual std::string label() const;
   virtual uint32 ssrc() const;
   virtual bool enabled() const;
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.cc b/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.cc
index 4d62eefe23..ee47648160 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.cc
+++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.cc
@@ -57,8 +57,8 @@ VideoCaptureModule* VideoTrack::GetVideoCapture() {
   return video_device_.get();
 }
 
-const char* VideoTrack::kind() const {
-  return kVideoTrackKind;
+std::string VideoTrack::kind() const {
+  return std::string(kVideoTrackKind);
 }
 
 talk_base::scoped_refptr<VideoTrack> VideoTrack::CreateRemote(
diff --git a/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.h b/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.h
index 4e0dd770a6..a0cdab2eab 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.h
+++ b/third_party_mods/libjingle/source/talk/app/webrtc_dev/videotrackimpl.h
@@ -58,7 +58,7 @@ class VideoTrack : public MediaTrack<LocalVideoTrackInterface> {
   virtual void SetRenderer(VideoRendererWrapperInterface* renderer);
   VideoRendererWrapperInterface* GetRenderer();
 
-  virtual const char* kind() const;
+  virtual std::string kind() const;
 
  protected:
   VideoTrack(const std::string& label, uint32 ssrc);