Move RtcEventLog object from inside VoiceEngine to Call.

webrtc/pc/channelmanager.h

 /*
  *  Copyright 2004 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.
  */
 
@@ skipping 107 matching lines @@
   // The operations below occur on the main thread.
 
   // Starts AEC dump using existing file, with a specified maximum file size in
   // bytes. When the limit is reached, logging will stop and the file will be
   // closed. If max_size_bytes is set to <= 0, no limit will be used.
   bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes);
 
   // Stops recording AEC dump.
   void StopAecDump();
 
-  // Starts RtcEventLog using existing file.
-  bool StartRtcEventLog(rtc::PlatformFile file);
-
-  // Stops logging RtcEventLog.
-  void StopRtcEventLog();
+  sigslot::signal2<VideoCapturer*, CaptureState> SignalVideoCaptureStateChange;

[the sun, 2016/03/23 10:26:45]

bad merge?

[ivoc, 2016/03/23 14:27:26]

Oh, oops, I think this is from the common ancestor (I use 3-way merge when
rebasing). Will remove, good find!

 
  private:
   typedef std::vector<VoiceChannel*> VoiceChannels;
   typedef std::vector<VideoChannel*> VideoChannels;
   typedef std::vector<DataChannel*> DataChannels;
 
   void Construct(MediaEngineInterface* me,
                  DataEngineInterface* dme,
                  rtc::Thread* worker_thread);
   bool InitMediaEngine_w();
@@ skipping 31 matching lines @@
 
   int audio_output_volume_;
   bool enable_rtx_;
 
   bool capturing_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_PC_CHANNELMANAGER_H_