Fixing the behavior of the candidate filter with pooled candidates.

webrtc/p2p/base/portallocator.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 53 matching lines @@
   }
   target_pooled_session_count_ = candidate_pool_size;
 }
 
 std::unique_ptr<PortAllocatorSession> PortAllocator::CreateSession(
     const std::string& sid,
     const std::string& content_name,
     int component,
     const std::string& ice_ufrag,
     const std::string& ice_pwd) {
-  return std::unique_ptr<PortAllocatorSession>(
+  auto session = std::unique_ptr<PortAllocatorSession>(
       CreateSessionInternal(content_name, component, ice_ufrag, ice_pwd));
+  session->SetCandidateFilter(candidate_filter());
+  return session;
 }
 
 std::unique_ptr<PortAllocatorSession> PortAllocator::TakePooledSession(
     const std::string& content_name,
     int component,
     const std::string& ice_ufrag,
     const std::string& ice_pwd) {
   RTC_DCHECK(!ice_ufrag.empty());
   RTC_DCHECK(!ice_pwd.empty());
   if (pooled_sessions_.empty()) {
     return nullptr;
   }
   std::unique_ptr<PortAllocatorSession> ret =
       std::move(pooled_sessions_.front());
   ret->SetIceParameters(content_name, component, ice_ufrag, ice_pwd);
+  // According to JSEP, a pooled session should filter candidates only after
+  // it's taken out of the pool.
+  ret->SetCandidateFilter(candidate_filter());
   pooled_sessions_.pop_front();
   return ret;
 }
 
 const PortAllocatorSession* PortAllocator::GetPooledSession() const {
   if (pooled_sessions_.empty()) {
     return nullptr;
   }
   return pooled_sessions_.front().get();
 }
 
 }  // namespace cricket