| Index: webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
 | 
| diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
 | 
| index eee586d1dd6d2e1292942bae8c50e9d90f4ed9d4..0b4edc60263bed3d6b93f964b58b622f0ab9f54a 100644
 | 
| --- a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
 | 
| +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc
 | 
| @@ -18,8 +18,6 @@
 | 
|  #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h"
 | 
|  #include "webrtc/test/testsupport/fileutils.h"
 | 
|  
 | 
| -using std::string;
 | 
| -
 | 
|  namespace webrtc {
 | 
|  namespace test {
 | 
|  
 | 
| @@ -29,7 +27,7 @@ const int kInitSeed = 0x12345678;
 | 
|  const int kPacketLossTimeUnitMs = 10;
 | 
|  
 | 
|  // Common validator for file names.
 | 
| -static bool ValidateFilename(const string& value, bool write) {
 | 
| +static bool ValidateFilename(const std::string& value, bool write) {
 | 
|    FILE* fid = write ? fopen(value.c_str(), "wb") : fopen(value.c_str(), "rb");
 | 
|    if (fid == nullptr)
 | 
|      return false;
 | 
| @@ -38,7 +36,7 @@ static bool ValidateFilename(const string& value, bool write) {
 | 
|  }
 | 
|  
 | 
|  // Define switch for input file name.
 | 
| -static bool ValidateInFilename(const char* flagname, const string& value) {
 | 
| +static bool ValidateInFilename(const char* flagname, const std::string& value) {
 | 
|    if (!ValidateFilename(value, false)) {
 | 
|      printf("Invalid input filename.");
 | 
|      return false;
 | 
| @@ -82,7 +80,8 @@ static const bool channels_dummy =
 | 
|      RegisterFlagValidator(&FLAGS_channels, &ValidateChannels);
 | 
|  
 | 
|  // Define switch for output file name.
 | 
| -static bool ValidateOutFilename(const char* flagname, const string& value) {
 | 
| +static bool ValidateOutFilename(const char* flagname,
 | 
| +                                const std::string& value) {
 | 
|    if (!ValidateFilename(value, true)) {
 | 
|      printf("Invalid output filename.");
 | 
|      return false;
 | 
| 
 |