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

Side by Side Diff: webrtc/pc/peerconnection.cc

Issue 2717973005: Test field trial group with startswith rather than equals. (Closed)
Patch Set: const char*, two more IsEnabled Created 3 years, 9 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 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 2492 matching lines...) Expand 10 before | Expand all | Expand 10 after
2503 2503
2504 // To handle both internal and externally created port allocator, we will 2504 // To handle both internal and externally created port allocator, we will
2505 // enable BUNDLE here. 2505 // enable BUNDLE here.
2506 int portallocator_flags = port_allocator_->flags(); 2506 int portallocator_flags = port_allocator_->flags();
2507 portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET | 2507 portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET |
2508 cricket::PORTALLOCATOR_ENABLE_IPV6; 2508 cricket::PORTALLOCATOR_ENABLE_IPV6;
2509 // If the disable-IPv6 flag was specified, we'll not override it 2509 // If the disable-IPv6 flag was specified, we'll not override it
2510 // by experiment. 2510 // by experiment.
2511 if (configuration.disable_ipv6) { 2511 if (configuration.disable_ipv6) {
2512 portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6); 2512 portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6);
2513 } else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") == 2513 } else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default")
2514 "Disabled") { 2514 .find("Disabled") == 0) {
2515 portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6); 2515 portallocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6);
2516 } 2516 }
2517 2517
2518 if (configuration.tcp_candidate_policy == kTcpCandidatePolicyDisabled) { 2518 if (configuration.tcp_candidate_policy == kTcpCandidatePolicyDisabled) {
2519 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_TCP; 2519 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_TCP;
2520 LOG(LS_INFO) << "TCP candidates are disabled."; 2520 LOG(LS_INFO) << "TCP candidates are disabled.";
2521 } 2521 }
2522 2522
2523 if (configuration.candidate_network_policy == 2523 if (configuration.candidate_network_policy ==
2524 kCandidateNetworkPolicyLowCost) { 2524 kCandidateNetworkPolicyLowCost) {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
2561 } 2561 }
2562 return event_log_->StartLogging(file, max_size_bytes); 2562 return event_log_->StartLogging(file, max_size_bytes);
2563 } 2563 }
2564 2564
2565 void PeerConnection::StopRtcEventLog_w() { 2565 void PeerConnection::StopRtcEventLog_w() {
2566 if (event_log_) { 2566 if (event_log_) {
2567 event_log_->StopLogging(); 2567 event_log_->StopLogging();
2568 } 2568 }
2569 } 2569 }
2570 } // namespace webrtc 2570 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698