Move Jingle-specific files from talk/session/media to webrtc/libjingle/session/media. This is part of an ongoing effort to remove Jingle-specific files from the WebRTC repository.

Also, fix the includes and header guards of examples/call. R=juberti@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/34559004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7972 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-12-19 22:29:55 +00:00
parent ed1a48b0cd
commit 4c0544ab07
23 changed files with 120 additions and 108 deletions
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@ -575,7 +575,6 @@
        '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
        'libjingle',
        'libjingle_media',
-        '<(webrtc_root)/libjingle/libjingle.gyp:jingle_session',
      ],
      'include_dirs': [
        '<(DEPTH)/testing/gtest/include',
@ -590,24 +589,18 @@
        'session/media/audiomonitor.h',
        'session/media/bundlefilter.cc',
        'session/media/bundlefilter.h',
-        'session/media/call.cc',
-        'session/media/call.h',
        'session/media/channel.cc',
        'session/media/channel.h',
        'session/media/channelmanager.cc',
        'session/media/channelmanager.h',
        'session/media/currentspeakermonitor.cc',
        'session/media/currentspeakermonitor.h',
-        'session/media/mediamessages.cc',
-        'session/media/mediamessages.h',
        'session/media/mediamonitor.cc',
        'session/media/mediamonitor.h',
        'session/media/mediarecorder.cc',
        'session/media/mediarecorder.h',
        'session/media/mediasession.cc',
        'session/media/mediasession.h',
-        'session/media/mediasessionclient.cc',
-        'session/media/mediasessionclient.h',
        'session/media/mediasink.h',
        'session/media/rtcpmuxfilter.cc',
        'session/media/rtcpmuxfilter.h',
--- a/talk/libjingle_tests.gyp
+++ b/talk/libjingle_tests.gyp
@ -167,9 +167,7 @@
        'session/media/channelmanager_unittest.cc',
        'session/media/currentspeakermonitor_unittest.cc',
        'session/media/mediarecorder_unittest.cc',
-        'session/media/mediamessages_unittest.cc',
        'session/media/mediasession_unittest.cc',
-        'session/media/mediasessionclient_unittest.cc',
        'session/media/rtcpmuxfilter_unittest.cc',
        'session/media/srtpfilter_unittest.cc',
      ],
--- a/talk/session/media/currentspeakermonitor_unittest.cc
+++ b/talk/session/media/currentspeakermonitor_unittest.cc
@ -25,7 +25,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "talk/session/media/call.h"
+#include "talk/session/media/audiomonitor.h"
 #include "talk/session/media/currentspeakermonitor.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/thread.h"
@ -42,21 +42,11 @@ static const uint32 kMinTimeBetweenSwitches = 10;
 // I am assuming system clocks do not have a coarser resolution than 90 ms.
 static const uint32 kSleepTimeBetweenSwitches = 100;

-class MockCall : public Call {
- public:
-  MockCall() : Call(NULL) {}
-
-  void EmitAudioMonitor(const AudioInfo& info) {
-    GetAudioSourceProxy()->SignalAudioMonitor(GetAudioSourceProxy(), info);
-  }
-};
-
 class CurrentSpeakerMonitorTest : public testing::Test,
    public sigslot::has_slots<> {
 public:
  CurrentSpeakerMonitorTest() {
-    call_ = new MockCall();
-    monitor_ = new CurrentSpeakerMonitor(call_->GetAudioSourceProxy(), NULL);
+    monitor_ = new CurrentSpeakerMonitor(&source_, NULL);
    // Shrink the minimum time betweeen switches to 10 ms so we don't have to
    // slow down our tests.
    monitor_->set_min_time_between_switches(kMinTimeBetweenSwitches);
@ -68,11 +58,14 @@ class CurrentSpeakerMonitorTest : public testing::Test,

  ~CurrentSpeakerMonitorTest() {
    delete monitor_;
-    delete call_;
+  }
+
+  void SignalAudioMonitor(const AudioInfo& info) {
+    source_.SignalAudioMonitor(&source_, info);
  }

 protected:
-  MockCall* call_;
+  AudioSourceContext source_;
  CurrentSpeakerMonitor* monitor_;
  int num_changes_;
  uint32 current_speaker_;
@ -91,7 +84,7 @@ static void InitAudioInfo(AudioInfo* info, int input_level, int output_level) {
 TEST_F(CurrentSpeakerMonitorTest, NoActiveStreams) {
  AudioInfo info;
  InitAudioInfo(&info, 0, 0);
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, 0U);
  EXPECT_EQ(num_changes_, 0);
@ -103,7 +96,7 @@ TEST_F(CurrentSpeakerMonitorTest, MultipleActiveStreams) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  // No speaker recognized because the initial sample is treated as possibly
  // just noise and disregarded.
@ -112,7 +105,7 @@ TEST_F(CurrentSpeakerMonitorTest, MultipleActiveStreams) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, kSsrc2);
  EXPECT_EQ(num_changes_, 1);
@ -125,21 +118,21 @@ TEST_F(CurrentSpeakerMonitorTest, DISABLED_RapidSpeakerChange) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, 0U);
  EXPECT_EQ(num_changes_, 0);

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, kSsrc2);
  EXPECT_EQ(num_changes_, 1);

  info.active_streams.push_back(std::make_pair(kSsrc1, 9));
  info.active_streams.push_back(std::make_pair(kSsrc2, 1));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  // We expect no speaker change because of the rapid change.
  EXPECT_EQ(current_speaker_, kSsrc2);
@ -152,14 +145,14 @@ TEST_F(CurrentSpeakerMonitorTest, SpeakerChange) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, 0U);
  EXPECT_EQ(num_changes_, 0);

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, kSsrc2);
  EXPECT_EQ(num_changes_, 1);
@ -169,7 +162,7 @@ TEST_F(CurrentSpeakerMonitorTest, SpeakerChange) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 9));
  info.active_streams.push_back(std::make_pair(kSsrc2, 1));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, kSsrc1);
  EXPECT_EQ(num_changes_, 2);
@ -181,21 +174,21 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, 0U);
  EXPECT_EQ(num_changes_, 0);

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, kSsrc2);
  EXPECT_EQ(num_changes_, 1);

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 7));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  EXPECT_EQ(current_speaker_, kSsrc2);
  EXPECT_EQ(num_changes_, 1);
@ -205,7 +198,7 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 0));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  // Current speaker shouldn't have changed because we treat this as an inter-
  // word silence.
@ -214,7 +207,7 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 0));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  // Current speaker shouldn't have changed because we treat this as an inter-
  // word silence.
@ -223,7 +216,7 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {

  info.active_streams.push_back(std::make_pair(kSsrc1, 3));
  info.active_streams.push_back(std::make_pair(kSsrc2, 0));
-  call_->EmitAudioMonitor(info);
+  SignalAudioMonitor(info);

  // At this point, we should have concluded that SSRC2 stopped speaking.
  EXPECT_EQ(current_speaker_, kSsrc1);
--- a/webrtc/libjingle/examples/call/call_main.cc
+++ b/webrtc/libjingle/examples/call/call_main.cc
@ -41,17 +41,17 @@
 #include "talk/examples/call/callclient.h"
 #include "talk/examples/call/console.h"
 #include "talk/examples/call/mediaenginefactory.h"
-#include "webrtc/p2p/base/constants.h"
-#include "webrtc/libjingle/media/mediasessionclient.h"
 #include "talk/session/media/srtpfilter.h"
-#include "webrtc/libjingle/xmpp/xmppauth.h"
-#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
-#include "webrtc/libjingle/xmpp/xmpppump.h"
-#include "webrtc/libjingle/xmpp/xmppsocket.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/base/win32socketserver.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/xmpp/xmppauth.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmpppump.h"
+#include "webrtc/libjingle/xmpp/xmppsocket.h"
+#include "webrtc/p2p/base/constants.h"

 class DebugLog : public sigslot::has_slots<> {
 public:
--- a/webrtc/libjingle/examples/call/callclient.cc
+++ b/webrtc/libjingle/examples/call/callclient.cc
@ -39,6 +39,12 @@
 #include "talk/media/base/mediaengine.h"
 #include "talk/media/base/rtpdataengine.h"
 #include "talk/media/base/screencastid.h"
+#ifdef HAVE_SCTP
+#include "talk/media/sctp/sctpdataengine.h"
+#endif
+#include "talk/media/base/videorenderer.h"
+#include "talk/media/devices/devicemanager.h"
+#include "talk/media/devices/videorendererfactory.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/network.h"
@ -47,23 +53,17 @@
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/windowpickerfactory.h"
-#ifdef HAVE_SCTP
-#include "talk/media/sctp/sctpdataengine.h"
-#endif
-#include "talk/media/base/videorenderer.h"
-#include "talk/media/devices/devicemanager.h"
-#include "talk/media/devices/videorendererfactory.h"
+#include "webrtc/libjingle/session/media/mediamessages.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"
 #include "webrtc/libjingle/session/sessionmanager.h"
-#include "webrtc/p2p/client/basicportallocator.h"
-#include "webrtc/p2p/client/sessionmanagertask.h"
-#include "webrtc/libjingle/media/mediamessages.h"
-#include "webrtc/libjingle/media/mediasessionclient.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
 #include "webrtc/libjingle/xmpp/mucroomconfigtask.h"
 #include "webrtc/libjingle/xmpp/mucroomlookuptask.h"
 #include "webrtc/libjingle/xmpp/pingtask.h"
 #include "webrtc/libjingle/xmpp/presenceouttask.h"
+#include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/p2p/client/sessionmanagertask.h"

 namespace {

--- a/webrtc/libjingle/examples/call/callclient.h
+++ b/webrtc/libjingle/examples/call/callclient.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef TALK_EXAMPLES_CALL_CALLCLIENT_H_
-#define TALK_EXAMPLES_CALL_CALLCLIENT_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_CALLCLIENT_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_CALLCLIENT_H_

 #include <map>
 #include <string>
@ -34,14 +34,14 @@

 #include "talk/examples/call/console.h"
 #include "talk/media/base/mediachannel.h"
-#include "webrtc/p2p/base/session.h"
-#include "webrtc/libjingle/media/mediamessages.h"
-#include "webrtc/libjingle/media/mediasessionclient.h"
+#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/sslidentity.h"
+#include "webrtc/libjingle/session/media/mediamessages.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"
 #include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
 #include "webrtc/libjingle/xmpp/presencestatus.h"
 #include "webrtc/libjingle/xmpp/xmppclient.h"
-#include "webrtc/base/scoped_ptr.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/p2p/base/session.h"

 namespace buzz {
 class PresencePushTask;
@ -349,4 +349,4 @@ class CallClient: public sigslot::has_slots<> {
  bool show_roster_messages_;
 };

-#endif  // TALK_EXAMPLES_CALL_CALLCLIENT_H_
+#endif  // WEBRTC_LIBJINGLE_EXAMPLES_CALL_CALLCLIENT_H_
--- a/webrtc/libjingle/examples/call/console.h
+++ b/webrtc/libjingle/examples/call/console.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef TALK_EXAMPLES_CALL_CONSOLE_H_
-#define TALK_EXAMPLES_CALL_CONSOLE_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_CONSOLE_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_CONSOLE_H_

 #include <stdio.h>

--- a/webrtc/libjingle/examples/call/friendinvitesendtask.h
+++ b/webrtc/libjingle/examples/call/friendinvitesendtask.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _FRIENDINVITESENDTASK_H_
-#define _FRIENDINVITESENDTASK_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_FRIENDINVITESENDTASK_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_FRIENDINVITESENDTASK_H_

 #include "webrtc/libjingle/xmpp/xmppengine.h"
 #include "webrtc/libjingle/xmpp/xmpptask.h"
--- a/webrtc/libjingle/examples/call/mediaenginefactory.h
+++ b/webrtc/libjingle/examples/call/mediaenginefactory.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef TALK_EXAMPLES_CALL_MEDIAENGINEFACTORY_H_
-#define TALK_EXAMPLES_CALL_MEDIAENGINEFACTORY_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_MEDIAENGINEFACTORY_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_MEDIAENGINEFACTORY_H_

 #include "talk/media/base/mediaengine.h"

@ -37,4 +37,4 @@ class MediaEngineFactory {
      const char* video_in, const char* video_out);
 };

-#endif  // TALK_EXAMPLES_CALL_MEDIAENGINEFACTORY_H_
+#endif  // WEBRTC_LIBJINGLE_EXAMPLES_CALL_MEDIAENGINEFACTORY_H_
--- a/webrtc/libjingle/examples/call/muc.h
+++ b/webrtc/libjingle/examples/call/muc.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _MUC_H_
-#define _MUC_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_MUC_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_MUC_H_

 #include <map>
 #include "webrtc/libjingle/xmpp/jid.h"
--- a/webrtc/libjingle/examples/call/mucinviterecvtask.h
+++ b/webrtc/libjingle/examples/call/mucinviterecvtask.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _MUCINVITERECVTASK_H_
-#define _MUCINVITERECVTASK_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_MUCINVITERECVTASK_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_MUCINVITERECVTASK_H_

 #include <vector>

--- a/webrtc/libjingle/examples/call/mucinvitesendtask.h
+++ b/webrtc/libjingle/examples/call/mucinvitesendtask.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _MUCINVITESENDTASK_H_
-#define _MUCINVITESENDTASK_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_MUCINVITESENDTASK_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_MUCINVITESENDTASK_H_

 #include "talk/examples/call/muc.h"
 #include "webrtc/libjingle/xmpp/xmppengine.h"
--- a/webrtc/libjingle/examples/call/presencepushtask.h
+++ b/webrtc/libjingle/examples/call/presencepushtask.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _PRESENCEPUSHTASK_H_
-#define _PRESENCEPUSHTASK_H_
+#ifndef WEBRTC_LIBJINGLE_EXAMPLES_CALL_PRESENCEPUSHTASK_H_
+#define WEBRTC_LIBJINGLE_EXAMPLES_CALL_PRESENCEPUSHTASK_H_

 #include <vector>

--- a/webrtc/libjingle/libjingle.gyp
+++ b/webrtc/libjingle/libjingle.gyp
@ -29,6 +29,7 @@
      'target_name': 'jingle_session',
      'type': 'static_library',
      'dependencies': [
+        '<(talk_root)/libjingle.gyp:libjingle_media',
        '<(webrtc_root)/base/base.gyp:webrtc_base',
        '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
        '<(DEPTH)/third_party/expat/expat.gyp:expat',
@ -44,10 +45,19 @@
        'session/p2ptransportparser.h',
        'session/rawtransportparser.cc',
        'session/rawtransportparser.h',
-        'session/sessionmanager.cc',
+        'session/sessionclient.h',
        'session/sessionmanager.h',
+        'session/sessionmanager.cc',
+        'session/sessionmanagertask.h',
+        'session/sessionsendtask.h',
        'session/transportparser.cc',
        'session/transportparser.h',
+        'session/media/call.cc',
+        'session/media/call.h',
+        'session/media/mediasessionclient.cc',
+        'session/media/mediasessionclient.h',
+        'session/media/mediamessages.cc',
+        'session/media/mediamessages.h',
        'session/tunnel/pseudotcpchannel.cc',
        'session/tunnel/pseudotcpchannel.h',
        'session/tunnel/tunnelsessionclient.cc',
@ -78,11 +88,27 @@
      'dependencies': [
        'jingle_session',
        '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
+        '<(talk_root)/libjingle.gyp:libjingle',
+        '<(talk_root)/libjingle.gyp:libjingle_p2p',
+        '<(talk_root)/libjingle_tests.gyp:libjingle_unittest_main',
      ],
      'sources': [
+        'session/media/mediamessages_unittest.cc',
+        'session/media/mediasessionclient_unittest.cc',
        'session/session_unittest.cc',
        'session/transportparser_unittest.cc',
      ],
+      'conditions': [
+        ['OS=="win"', {
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'AdditionalDependencies': [
+                'strmiids.lib',
+              ],
+            },
+          },
+        }],
+      ],
    },  # target jingle_session_unittest
    {
      'target_name': 'login',
--- a/webrtc/libjingle/session/media/call.cc
+++ b/webrtc/libjingle/session/media/call.cc
@ -25,17 +25,19 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#include "webrtc/libjingle/session/media/call.h"
+
 #include <string>
+
 #include "talk/media/base/constants.h"
 #include "talk/media/base/screencastid.h"
-#include "webrtc/p2p/base/parsing.h"
-#include "talk/session/media/call.h"
 #include "talk/session/media/currentspeakermonitor.h"
-#include "talk/session/media/mediasessionclient.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/window.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"
+#include "webrtc/p2p/base/parsing.h"

 namespace cricket {

--- a/webrtc/libjingle/session/media/call.h
+++ b/webrtc/libjingle/session/media/call.h
@ -25,8 +25,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef TALK_SESSION_MEDIA_CALL_H_
-#define TALK_SESSION_MEDIA_CALL_H_
+#ifndef WEBRTC_LIBJINGLE_SESSION_MEDIA_CALL_H_
+#define WEBRTC_LIBJINGLE_SESSION_MEDIA_CALL_H_

 #include <deque>
 #include <map>
@ -39,12 +39,13 @@
 #include "talk/media/base/videocommon.h"
 #include "talk/session/media/audiomonitor.h"
 #include "talk/session/media/currentspeakermonitor.h"
-#include "talk/session/media/mediamessages.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/messagequeue.h"
+#include "webrtc/libjingle/session/media/mediamessages.h"
 #include "webrtc/libjingle/session/sessionmanager.h"
 #include "webrtc/libjingle/xmpp/jid.h"
 #include "webrtc/p2p/client/socketmonitor.h"
+#include "webrtc/p2p/client/socketmonitor.h"

 namespace cricket {

@ -304,4 +305,4 @@ class Call : public rtc::MessageHandler, public sigslot::has_slots<> {

 }  // namespace cricket

-#endif  // TALK_SESSION_MEDIA_CALL_H_
+#endif  // WEBRTC_LIBJINGLE_SESSION_MEDIA_CALL_H_
--- a/webrtc/libjingle/session/media/mediamessages.cc
+++ b/webrtc/libjingle/session/media/mediamessages.cc
@ -29,11 +29,10 @@
 * Documentation is in mediamessages.h.
 */

-#include "talk/session/media/mediamessages.h"
+#include "webrtc/libjingle/session/media/mediamessages.h"

 #include "webrtc/p2p/base/constants.h"
-#include "webrtc/p2p/base/parsing.h"
-#include "talk/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
--- a/webrtc/libjingle/session/media/mediamessages.h
+++ b/webrtc/libjingle/session/media/mediamessages.h
@ -33,8 +33,8 @@
 * goto/jinglemuc
 */

-#ifndef TALK_SESSION_MEDIA_MEDIAMESSAGES_H_
-#define TALK_SESSION_MEDIA_MEDIAMESSAGES_H_
+#ifndef WEBRTC_LIBJINGLE_SESSION_MEDIA_MEDIAMESSAGES_H_
+#define WEBRTC_LIBJINGLE_SESSION_MEDIA_MEDIAMESSAGES_H_

 #include <string>
 #include <vector>
@ -95,4 +95,4 @@ void WriteJingleRtpHeaderExtensions(

 }  // namespace cricket

-#endif  // TALK_SESSION_MEDIA_MEDIAMESSAGES_H_
+#endif  // WEBRTC_LIBJINGLE_SESSION_MEDIA_MEDIAMESSAGES_H_
--- a/webrtc/libjingle/session/media/mediamessages_unittest.cc
+++ b/webrtc/libjingle/session/media/mediamessages_unittest.cc
@ -25,13 +25,13 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "talk/session/media/mediamessages.h"
+#include "webrtc/libjingle/session/media/mediamessages.h"

 #include <string>
 #include <vector>

 #include "webrtc/p2p/base/constants.h"
-#include "talk/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/scoped_ptr.h"
--- a/webrtc/libjingle/session/media/mediasessionclient.cc
+++ b/webrtc/libjingle/session/media/mediasessionclient.cc
@ -27,22 +27,22 @@

 #include <string>

-#include "talk/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"

 #include "talk/media/base/capturemanager.h"
 #include "talk/media/base/cryptoparams.h"
 #include "talk/media/sctp/sctpdataengine.h"
-#include "webrtc/p2p/base/constants.h"
-#include "webrtc/p2p/base/parsing.h"
-#include "talk/session/media/mediamessages.h"
 #include "talk/session/media/srtpfilter.h"
-#include "webrtc/libjingle/xmllite/qname.h"
-#include "webrtc/libjingle/xmllite/xmlconstants.h"
-#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
+#include "webrtc/libjingle/session/media/mediamessages.h"
+#include "webrtc/libjingle/xmllite/qname.h"
+#include "webrtc/libjingle/xmllite/xmlconstants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/parsing.h"

 namespace cricket {

--- a/webrtc/libjingle/session/media/mediasessionclient.h
+++ b/webrtc/libjingle/session/media/mediasessionclient.h
@ -25,23 +25,23 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef TALK_SESSION_MEDIA_MEDIASESSIONCLIENT_H_
-#define TALK_SESSION_MEDIA_MEDIASESSIONCLIENT_H_
+#ifndef WEBRTC_LIBJINGLE_SESSION_MEDIA_MEDIASESSIONCLIENT_H_
+#define WEBRTC_LIBJINGLE_SESSION_MEDIA_MEDIASESSIONCLIENT_H_

 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
+
 #include "talk/media/base/cryptoparams.h"
-#include "talk/session/media/call.h"
 #include "talk/session/media/channelmanager.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sigslotrepeater.h"
 #include "webrtc/base/thread.h"
+#include "webrtc/libjingle/session/media/call.h"
 #include "webrtc/libjingle/session/sessionmanager.h"
-#include "webrtc/p2p/base/session.h"
 #include "webrtc/p2p/base/sessionclient.h"
 #include "webrtc/p2p/base/sessiondescription.h"

@ -172,4 +172,4 @@ class MediaSessionClient : public SessionClient, public sigslot::has_slots<> {

 }  // namespace cricket

-#endif  // TALK_SESSION_MEDIA_MEDIASESSIONCLIENT_H_
+#endif  // WEBRTC_LIBJINGLE_SESSION_MEDIA_MEDIASESSIONCLIENT_H_
--- a/webrtc/libjingle/session/media/mediasessionclient_unittest.cc
+++ b/webrtc/libjingle/session/media/mediasessionclient_unittest.cc
@ -33,7 +33,7 @@
 #include "talk/media/devices/fakedevicemanager.h"
 #include "webrtc/p2p/base/constants.h"
 #include "webrtc/p2p/client/basicportallocator.h"
-#include "talk/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/session/media/mediasessionclient.h"
 #include "webrtc/libjingle/xmllite/xmlbuilder.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/libjingle/xmllite/xmlprinter.h"
--- a/webrtc/libjingle/session/sessionmanager.h
+++ b/webrtc/libjingle/session/sessionmanager.h
@ -16,6 +16,8 @@
 #include <utility>
 #include <vector>

+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/thread.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/p2p/base/parsing.h"
@ -24,8 +26,6 @@
 #include "webrtc/p2p/base/sessionclient.h"
 #include "webrtc/p2p/base/sessionmessages.h"
 #include "webrtc/p2p/base/transportdescriptionfactory.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"

 namespace buzz {
 class QName;