Move talk/app/webrtc to webrtc/api

talk/session/media/channelmanager.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 15 matching lines @@
  */
 
 #include "talk/session/media/channelmanager.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 #include <algorithm>
 
-#include "talk/app/webrtc/mediacontroller.h"
-#include "webrtc/media/base/capturemanager.h"
-#include "webrtc/media/base/device.h"
-#include "webrtc/media/base/hybriddataengine.h"
-#include "webrtc/media/base/rtpdataengine.h"
-#include "webrtc/media/base/videocapturer.h"
-#ifdef HAVE_SCTP
-#include "webrtc/media/sctp/sctpdataengine.h"
-#endif
 #include "talk/session/media/srtpfilter.h"
+#include "webrtc/api/mediacontroller.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/sigslotrepeater.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/trace_event.h"
+#include "webrtc/media/base/capturemanager.h"
+#include "webrtc/media/base/device.h"
+#include "webrtc/media/base/hybriddataengine.h"
+#include "webrtc/media/base/rtpdataengine.h"
+#include "webrtc/media/base/videocapturer.h"
+#ifdef HAVE_SCTP
+#include "webrtc/media/sctp/sctpdataengine.h"
+#endif
 
 namespace cricket {
 
 enum {
   MSG_VIDEOCAPTURESTATE = 1,
 };
 
 using rtc::Bind;
 
 static const int kNotSetOutputVolume = -1;
@@ skipping 505 matching lines @@
   return worker_thread_->Invoke<bool>(
       Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file));
 }
 
 void ChannelManager::StopRtcEventLog() {
   worker_thread_->Invoke<void>(
       Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get()));
 }
 
 }  // namespace cricket