| Index: talk/app/webrtc/webrtcsession.h
 | 
| diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h
 | 
| index bb405c5da47657635076545757950c06da95c71b..0da3e6f230d3f9c3fdd160e8769cbcd45975a5a7 100644
 | 
| --- a/talk/app/webrtc/webrtcsession.h
 | 
| +++ b/talk/app/webrtc/webrtcsession.h
 | 
| @@ -32,6 +32,7 @@
 | 
|  
 | 
|  #include "talk/app/webrtc/datachannel.h"
 | 
|  #include "talk/app/webrtc/dtmfsender.h"
 | 
| +#include "talk/app/webrtc/mediacontroller.h"
 | 
|  #include "talk/app/webrtc/mediastreamprovider.h"
 | 
|  #include "talk/app/webrtc/peerconnectioninterface.h"
 | 
|  #include "talk/app/webrtc/statstypes.h"
 | 
| @@ -195,7 +196,6 @@ class WebRtcSession : public cricket::BaseSession,
 | 
|    virtual bool GetLocalTrackIdBySsrc(uint32 ssrc, std::string* track_id);
 | 
|    virtual bool GetRemoteTrackIdBySsrc(uint32 ssrc, std::string* track_id);
 | 
|  
 | 
| -
 | 
|    // AudioMediaProviderInterface implementation.
 | 
|    void SetAudioPlayout(uint32 ssrc,
 | 
|                         bool enable,
 | 
| @@ -370,6 +370,7 @@ class WebRtcSession : public cricket::BaseSession,
 | 
|  
 | 
|    void ReportNegotiatedCiphers(const cricket::TransportStats& stats);
 | 
|  
 | 
| +  rtc::scoped_ptr<MediaController> media_controller_;
 | 
|    rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_;
 | 
|    rtc::scoped_ptr<cricket::VideoChannel> video_channel_;
 | 
|    rtc::scoped_ptr<cricket::DataChannel> data_channel_;
 | 
| 
 |