From e46f5db8bf91c1972f41f4a548ddf3bc5b7c2d9f Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Tue, 26 Mar 2019 20:14:46 +0100
Subject: [PATCH] Add missing `using` declarations for names in testing
 namespace.

This code was unnecessarily depending on ADL
(https://abseil.io/tips/49).

Bug: None
Change-Id: I4f130fbd46bf3c7cc3b4313c9c85f1ac9dc64cc9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129764
Reviewed-by: Minyue Li <minyue@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27340}
---
 modules/audio_coding/neteq/neteq_impl_unittest.cc | 15 ++++++++-------
 pc/peer_connection_integrationtest.cc             |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc
index 5875493b61..00b3174ff0 100644
--- a/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc
@@ -37,17 +37,18 @@
 #include "test/mock_audio_decoder.h"
 #include "test/mock_audio_decoder_factory.h"
 
-using ::testing::AtLeast;
-using ::testing::Return;
-using ::testing::ReturnNull;
 using ::testing::_;
-using ::testing::SetArgPointee;
-using ::testing::SetArrayArgument;
+using ::testing::AtLeast;
+using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Invoke;
-using ::testing::WithArg;
-using ::testing::Pointee;
 using ::testing::IsNull;
+using ::testing::Pointee;
+using ::testing::Return;
+using ::testing::ReturnNull;
+using ::testing::SetArgPointee;
+using ::testing::SetArrayArgument;
+using ::testing::WithArg;
 
 namespace webrtc {
 
diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc
index c14bb91be7..33aa038136 100644
--- a/pc/peer_connection_integrationtest.cc
+++ b/pc/peer_connection_integrationtest.cc
@@ -80,6 +80,7 @@ using ::rtc::SocketAddress;
 using ::testing::_;
 using ::testing::Combine;
 using ::testing::Contains;
+using ::testing::DoAll;
 using ::testing::ElementsAre;
 using ::testing::NiceMock;
 using ::testing::Return;