Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / rtc_peer_connection_handler_unittest.cc

diff --git a/src/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/src/content/renderer/media/rtc_peer_connection_handler_unittest.cc
index 7ed95ff..2bd05e7 100644 (file)
--- a/src/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/src/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -93,7 +93,7 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest {
   }
   virtual scoped_refptr<LocalRTCStatsResponse> createResponse() OVERRIDE {
     DCHECK(!response_.get());
-    response_ = new talk_base::RefCountedObject<MockRTCStatsResponse>();
+    response_ = new rtc::RefCountedObject<MockRTCStatsResponse>();
     return response_;
   }
 
@@ -143,8 +143,7 @@ class MockPeerConnectionTracker : public PeerConnectionTracker {
   MOCK_METHOD3(
       TrackUpdateIce,
       void(RTCPeerConnectionHandler* pc_handler,
-           const std::vector<
-               webrtc::PeerConnectionInterface::IceServer>& servers,
+           const webrtc::PeerConnectionInterface::RTCConfiguration& config,
            const RTCMediaConstraints& options));
   MOCK_METHOD3(TrackAddIceCandidate,
                void(RTCPeerConnectionHandler* pc_handler,
@@ -460,7 +459,7 @@ TEST_F(RTCPeerConnectionHandlerTest, addStreamWithStoppedAudioAndVideoTrack) {
 
 TEST_F(RTCPeerConnectionHandlerTest, GetStatsNoSelector) {
   scoped_refptr<MockRTCStatsRequest> request(
-      new talk_base::RefCountedObject<MockRTCStatsRequest>());
+      new rtc::RefCountedObject<MockRTCStatsRequest>());
   pc_handler_->getStats(request.get());
   // Note that callback gets executed synchronously by mock.
   ASSERT_TRUE(request->result());
@@ -469,7 +468,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsNoSelector) {
 
 TEST_F(RTCPeerConnectionHandlerTest, GetStatsAfterClose) {
   scoped_refptr<MockRTCStatsRequest> request(
-      new talk_base::RefCountedObject<MockRTCStatsRequest>());
+      new rtc::RefCountedObject<MockRTCStatsRequest>());
   pc_handler_->stop();
   pc_handler_->getStats(request.get());
   // Note that callback gets executed synchronously by mock.
@@ -487,7 +486,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithLocalSelector) {
   ASSERT_LE(1ul, tracks.size());
 
   scoped_refptr<MockRTCStatsRequest> request(
-      new talk_base::RefCountedObject<MockRTCStatsRequest>());
+      new rtc::RefCountedObject<MockRTCStatsRequest>());
   request->setSelector(tracks[0]);
   pc_handler_->getStats(request.get());
   EXPECT_EQ(1, request->result()->report_count());
@@ -504,7 +503,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithRemoteSelector) {
   ASSERT_LE(1ul, tracks.size());
 
   scoped_refptr<MockRTCStatsRequest> request(
-      new talk_base::RefCountedObject<MockRTCStatsRequest>());
+      new rtc::RefCountedObject<MockRTCStatsRequest>());
   request->setSelector(tracks[0]);
   pc_handler_->getStats(request.get());
   EXPECT_EQ(1, request->result()->report_count());
@@ -523,7 +522,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithBadSelector) {
   mock_peer_connection_->SetGetStatsResult(false);
 
   scoped_refptr<MockRTCStatsRequest> request(
-      new talk_base::RefCountedObject<MockRTCStatsRequest>());
+      new rtc::RefCountedObject<MockRTCStatsRequest>());
   request->setSelector(component);
   pc_handler_->getStats(request.get());
   EXPECT_EQ(0, request->result()->report_count());