Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / session / media / channelmanager_unittest.cc

diff --git a/src/third_party/libjingle/source/talk/session/media/channelmanager_unittest.cc b/src/third_party/libjingle/source/talk/session/media/channelmanager_unittest.cc
index 98f1400..4c6f4ab 100644 (file)
--- a/src/third_party/libjingle/source/talk/session/media/channelmanager_unittest.cc
+++ b/src/third_party/libjingle/source/talk/session/media/channelmanager_unittest.cc
@@ -29,7 +29,7 @@
 #include "talk/media/base/nullvideorenderer.h"
 #include "talk/media/base/testutils.h"
 #include "talk/media/devices/fakedevicemanager.h"
-#include "talk/p2p/base/fakesession.h"
+#include "webrtc/p2p/base/fakesession.h"
 #include "talk/session/media/channelmanager.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
@@ -127,9 +127,8 @@ TEST_F(ChannelManagerTest, CreateDestroyChannels) {
   cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
       session_, cricket::CN_AUDIO, false);
   EXPECT_TRUE(voice_channel != NULL);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(session_, cricket::CN_VIDEO,
-                              false, voice_channel);
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      session_, cricket::CN_VIDEO, false, VideoOptions(), voice_channel);
   EXPECT_TRUE(video_channel != NULL);
   cricket::DataChannel* data_channel =
       cm_->CreateDataChannel(session_, cricket::CN_DATA,
@@ -151,9 +150,8 @@ TEST_F(ChannelManagerTest, CreateDestroyChannelsOnThread) {
   cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
       session_, cricket::CN_AUDIO, false);
   EXPECT_TRUE(voice_channel != NULL);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(session_, cricket::CN_VIDEO,
-                              false, voice_channel);
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      session_, cricket::CN_VIDEO, false, VideoOptions(), voice_channel);
   EXPECT_TRUE(video_channel != NULL);
   cricket::DataChannel* data_channel =
       cm_->CreateDataChannel(session_, cricket::CN_DATA,
@@ -178,9 +176,8 @@ TEST_F(ChannelManagerTest, NoTransportChannelTest) {
   cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
       session_, cricket::CN_AUDIO, false);
   EXPECT_TRUE(voice_channel == NULL);
-  cricket::VideoChannel* video_channel =
-      cm_->CreateVideoChannel(session_, cricket::CN_VIDEO,
-                              false, voice_channel);
+  cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
+      session_, cricket::CN_VIDEO, false, VideoOptions(), voice_channel);
   EXPECT_TRUE(video_channel == NULL);
   cricket::DataChannel* data_channel =
       cm_->CreateDataChannel(session_, cricket::CN_DATA,