| Index: webrtc/pc/mediasession.cc
|
| diff --git a/talk/session/media/mediasession.cc b/webrtc/pc/mediasession.cc
|
| similarity index 99%
|
| rename from talk/session/media/mediasession.cc
|
| rename to webrtc/pc/mediasession.cc
|
| index b6f52c2b62155e1a8917e7073eabe1df1e810d9b..357c3276bad078283123efd9f1fb3dee7fd09e5c 100644
|
| --- a/talk/session/media/mediasession.cc
|
| +++ b/webrtc/pc/mediasession.cc
|
| @@ -25,15 +25,15 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "talk/session/media/mediasession.h"
|
| +#include "webrtc/pc/mediasession.h"
|
|
|
| #include <functional>
|
| #include <map>
|
| #include <set>
|
| #include <utility>
|
|
|
| -#include "talk/session/media/channelmanager.h"
|
| -#include "talk/session/media/srtpfilter.h"
|
| +#include "webrtc/pc/channelmanager.h"
|
| +#include "webrtc/pc/srtpfilter.h"
|
| #include "webrtc/base/helpers.h"
|
| #include "webrtc/base/logging.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
|
|