Delete MediaController class, move Call ownership to PeerConnection.

webrtc/pc/peerconnectionfactory.h

 /*
  *  Copyright 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_PC_PEERCONNECTIONFACTORY_H_
 #define WEBRTC_PC_PEERCONNECTIONFACTORY_H_
 
 #include <memory>
 #include <string>
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/rtccertificategenerator.h"
 #include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/mediacontroller.h"
 
 namespace rtc {
 class BasicNetworkManager;
 class BasicPacketSocketFactory;
 }
 
 namespace webrtc {
 
 class RtcEventLog;
 
@@ skipping 55 matching lines @@
   // TODO(ivoc) Remove after Chrome is updated.
   bool StartRtcEventLog(rtc::PlatformFile file) override { return false; }
   // TODO(ivoc) Remove after Chrome is updated.
   bool StartRtcEventLog(rtc::PlatformFile file,
                         int64_t max_size_bytes) override {
     return false;
   }
   // TODO(ivoc) Remove after Chrome is updated.
   void StopRtcEventLog() override {}
 
-  virtual webrtc::MediaControllerInterface* CreateMediaController(
-      const cricket::MediaConfig& config,
-      RtcEventLog* event_log) const;
   virtual cricket::TransportController* CreateTransportController(
       cricket::PortAllocator* port_allocator,
       bool redetermine_role_on_ice_restart);
+  virtual cricket::ChannelManager* channel_manager();
   virtual rtc::Thread* signaling_thread();
   virtual rtc::Thread* worker_thread();
   virtual rtc::Thread* network_thread();
   const Options& options() const { return options_; }
 
  protected:
   PeerConnectionFactory(
       rtc::scoped_refptr<webrtc::AudioEncoderFactory> audio_encoder_factory,
       rtc::scoped_refptr<webrtc::AudioDecoderFactory> audio_decoder_factory);
   PeerConnectionFactory(
@@ skipping 30 matching lines @@
   std::unique_ptr<rtc::BasicNetworkManager> default_network_manager_;
   std::unique_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
   // External audio mixer. This can be NULL. In that case, internal audio mixer
   // will be created and used.
   rtc::scoped_refptr<AudioMixer> external_audio_mixer_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_PC_PEERCONNECTIONFACTORY_H_