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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp

Issue 1417023003: Disable test and remove the reference of enable_localhost_ice_candidate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test cases with certificates Created 5 years, 1 month 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 ASSERT(!isNull()); 64 ASSERT(!isNull());
65 return m_private->username(); 65 return m_private->username();
66 } 66 }
67 67
68 WebString WebRTCICEServer::credential() const 68 WebString WebRTCICEServer::credential() const
69 { 69 {
70 ASSERT(!isNull()); 70 ASSERT(!isNull());
71 return m_private->credential(); 71 return m_private->credential();
72 } 72 }
73 73
74 WebRTCICEServerArray::WebRTCICEServerArray(RTCIceServerArray* iceServers)
75 : m_private(iceServers)
76 {
77 }
78
79 void WebRTCICEServerArray::assign(const WebRTCICEServerArray& other)
80 {
81 m_private = other.m_private;
82 }
83
84 void WebRTCICEServerArray::reset()
85 {
86 m_private.reset();
87 }
88
89 size_t WebRTCICEServerArray::numberOfServers() const
90 {
91 ASSERT(!isNull());
92 return m_private->numberOfServers();
93 }
94
95 WebRTCICEServer WebRTCICEServerArray::server(size_t index) const
96 {
97 ASSERT(!isNull());
98 return WebRTCICEServer(m_private->server(index));
99 }
100
101 WebRTCConfiguration::WebRTCConfiguration(RTCConfiguration* configuration) 74 WebRTCConfiguration::WebRTCConfiguration(RTCConfiguration* configuration)
102 : m_private(configuration) 75 : m_private(configuration)
103 { 76 {
104 } 77 }
105 78
106 void WebRTCConfiguration::assign(const WebRTCConfiguration& other) 79 void WebRTCConfiguration::assign(const WebRTCConfiguration& other)
107 { 80 {
108 m_private = other.m_private; 81 m_private = other.m_private;
109 } 82 }
110 83
111 void WebRTCConfiguration::reset() 84 void WebRTCConfiguration::reset()
112 { 85 {
113 m_private.reset(); 86 m_private.reset();
114 } 87 }
115 88
89 size_t WebRTCConfiguration::numberOfServers() const
90 {
91 ASSERT(!isNull());
92 return m_private->numberOfServers();
93 }
94
95 WebRTCICEServer WebRTCConfiguration::server(size_t index) const
96 {
97 ASSERT(!isNull());
98 return WebRTCICEServer(m_private->server(index));
99 }
100
116 WebRTCIceTransports WebRTCConfiguration::iceTransports() const 101 WebRTCIceTransports WebRTCConfiguration::iceTransports() const
117 { 102 {
118 ASSERT(!isNull()); 103 ASSERT(!isNull());
119 switch (m_private->iceTransports()) { 104 switch (m_private->iceTransports()) {
120 case RTCIceTransportsNone: 105 case RTCIceTransportsNone:
121 return WebRTCIceTransportsNone; 106 return WebRTCIceTransportsNone;
122 case RTCIceTransportsRelay: 107 case RTCIceTransportsRelay:
123 return WebRTCIceTransportsRelay; 108 return WebRTCIceTransportsRelay;
124 case RTCIceTransportsAll: 109 case RTCIceTransportsAll:
125 return WebRTCIceTransportsAll; 110 return WebRTCIceTransportsAll;
(...skipping 26 matching lines...) Expand all
152 case RTCRtcpMuxPolicyNegotiate: 137 case RTCRtcpMuxPolicyNegotiate:
153 return WebRTCRtcpMuxPolicyNegotiate; 138 return WebRTCRtcpMuxPolicyNegotiate;
154 case RTCRtcpMuxPolicyRequire: 139 case RTCRtcpMuxPolicyRequire:
155 return WebRTCRtcpMuxPolicyRequire; 140 return WebRTCRtcpMuxPolicyRequire;
156 default: 141 default:
157 ASSERT_NOT_REACHED(); 142 ASSERT_NOT_REACHED();
158 } 143 }
159 return WebRTCRtcpMuxPolicyNegotiate; 144 return WebRTCRtcpMuxPolicyNegotiate;
160 } 145 }
161 146
162 WebRTCICEServerArray WebRTCConfiguration::iceServers() const
163 {
164 ASSERT(!isNull());
165 return WebRTCICEServerArray(m_private->iceServers());
166 }
167
168 size_t WebRTCConfiguration::numberOfCertificates() const 147 size_t WebRTCConfiguration::numberOfCertificates() const
169 { 148 {
170 ASSERT(!isNull()); 149 ASSERT(!isNull());
171 return m_private->numberOfCertificates(); 150 return m_private->numberOfCertificates();
172 } 151 }
173 152
174 WebRTCCertificate* WebRTCConfiguration::certificate(size_t index) const 153 WebRTCCertificate* WebRTCConfiguration::certificate(size_t index) const
175 { 154 {
176 ASSERT(!isNull()); 155 ASSERT(!isNull());
177 return m_private->certificate(index); 156 return m_private->certificate(index);
178 } 157 }
179 158
180 } // namespace blink 159 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698