Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 30 matching lines...) Expand all
41 #include "third_party/WebKit/public/platform/WebRTCDataChannelHandler.h" 41 #include "third_party/WebKit/public/platform/WebRTCDataChannelHandler.h"
42 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h" 42 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h"
43 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" 43 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h"
44 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h " 44 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h "
45 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" 45 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h"
46 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h" 46 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h"
47 #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h" 47 #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h"
48 #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h" 48 #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h"
49 #include "third_party/WebKit/public/platform/WebURL.h" 49 #include "third_party/WebKit/public/platform/WebURL.h"
50 #include "third_party/WebKit/public/web/WebHeap.h" 50 #include "third_party/WebKit/public/web/WebHeap.h"
51 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 51 #include "third_party/webrtc/api/peerconnectioninterface.h"
52 52
53 static const char kDummySdp[] = "dummy sdp"; 53 static const char kDummySdp[] = "dummy sdp";
54 static const char kDummySdpType[] = "dummy type"; 54 static const char kDummySdpType[] = "dummy type";
55 55
56 using blink::WebRTCPeerConnectionHandlerClient; 56 using blink::WebRTCPeerConnectionHandlerClient;
57 using testing::NiceMock; 57 using testing::NiceMock;
58 using testing::_; 58 using testing::_;
59 using testing::Ref; 59 using testing::Ref;
60 using testing::SaveArg; 60 using testing::SaveArg;
61 61
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 EXPECT_CALL(*mock_tracker_.get(), 1038 EXPECT_CALL(*mock_tracker_.get(),
1039 TrackCreateDTMFSender(pc_handler_.get(), 1039 TrackCreateDTMFSender(pc_handler_.get(),
1040 testing::Ref(tracks[0]))); 1040 testing::Ref(tracks[0])));
1041 1041
1042 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( 1042 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender(
1043 pc_handler_->createDTMFSender(tracks[0])); 1043 pc_handler_->createDTMFSender(tracks[0]));
1044 EXPECT_TRUE(sender.get()); 1044 EXPECT_TRUE(sender.get());
1045 } 1045 }
1046 1046
1047 } // namespace content 1047 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_media_constraints.h ('k') | content/renderer/media/user_media_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698