| Index: talk/app/webrtc/mediacontroller.h
 | 
| diff --git a/talk/app/webrtc/mediacontroller.h b/talk/app/webrtc/mediacontroller.h
 | 
| index 68798515d00984c586a88fbf8346f75ca96f309b..c27917ca3c9f92b4215445c1e91259788154399f 100644
 | 
| --- a/talk/app/webrtc/mediacontroller.h
 | 
| +++ b/talk/app/webrtc/mediacontroller.h
 | 
| @@ -29,20 +29,27 @@
 | 
|  #define TALK_APP_WEBRTC_MEDIACONTROLLER_H_
 | 
|  
 | 
|  #include "webrtc/base/thread.h"
 | 
| +#include "webrtc/common_types.h"
 | 
| +#include "webrtc/call.h"
 | 
| +
 | 
| +namespace cricket {
 | 
| +class ChannelManager;
 | 
| +}  // namespace cricket
 | 
|  
 | 
|  namespace webrtc {
 | 
| -class Call;
 | 
|  class VoiceEngine;
 | 
|  
 | 
|  // The MediaController currently owns shared state between media channels, but
 | 
|  // in the future will create and own RtpSenders and RtpReceivers.
 | 
|  class MediaControllerInterface {
 | 
|   public:
 | 
| -  static MediaControllerInterface* Create(rtc::Thread* worker_thread,
 | 
| -                                          webrtc::VoiceEngine* voice_engine);
 | 
| +  static MediaControllerInterface* Create(
 | 
| +      rtc::Thread* worker_thread,
 | 
| +      cricket::ChannelManager* channel_manager);
 | 
|  
 | 
|    virtual ~MediaControllerInterface() {}
 | 
|    virtual webrtc::Call* call_w() = 0;
 | 
| +  virtual cricket::ChannelManager* channel_manager() const = 0;
 | 
|  };
 | 
|  }  // namespace webrtc
 | 
|  
 | 
| 
 |