Roll chromium_revision 7a4fb8d..f527e86 (370025:370073)

webrtc/modules/audio_device/test/audio_device_test_api.cc

 /*
  *  Copyright (c) 2012 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 897 matching lines @@
 #ifdef _WIN32
   // use kDefaultCommunicationDevice and modify/retrieve the volume
   EXPECT_TRUE(audio_device_->SetPlayoutDevice(
           AudioDeviceModule::kDefaultCommunicationDevice) == 0);
   EXPECT_EQ(0, audio_device_->SpeakerVolumeIsAvailable(&available));
   if (available) {
     EXPECT_EQ(0, audio_device_->InitSpeaker());
     EXPECT_EQ(0, audio_device_->MaxSpeakerVolume(&maxVolume));
     EXPECT_EQ(0, audio_device_->MinSpeakerVolume(&minVolume));
     EXPECT_EQ(0, audio_device_->SpeakerVolumeStepSize(&stepSize));
-    for (vol = minVolume; vol < (int)maxVolume; vol += 20*stepSize) {
+    for (vol = minVolume; vol < (unsigned int)maxVolume; vol += 20*stepSize) {
       EXPECT_EQ(0, audio_device_->SetSpeakerVolume(vol));
       EXPECT_EQ(0, audio_device_->SpeakerVolume(&volume));
       CheckVolume(volume, vol);
     }
   }
 #endif
 
   // use kDefaultDevice and modify/retrieve the volume
   EXPECT_EQ(0, audio_device_->SetPlayoutDevice(MACRO_DEFAULT_DEVICE));
   EXPECT_EQ(0, audio_device_->SpeakerVolumeIsAvailable(&available));
@@ skipping 131 matching lines @@
   // initialize kDefaultCommunicationDevice and modify/retrieve the volume
   EXPECT_TRUE(audio_device_->SetRecordingDevice(
           AudioDeviceModule::kDefaultCommunicationDevice) == 0);
   EXPECT_EQ(0, audio_device_->MicrophoneVolumeIsAvailable(&available));
   if (available)
   {
     EXPECT_EQ(0, audio_device_->InitMicrophone());
     EXPECT_EQ(0, audio_device_->MaxMicrophoneVolume(&maxVolume));
     EXPECT_EQ(0, audio_device_->MinMicrophoneVolume(&minVolume));
     EXPECT_EQ(0, audio_device_->MicrophoneVolumeStepSize(&stepSize));
-    for (vol = minVolume; vol < (int)maxVolume; vol += 10*stepSize)
+    for (vol = minVolume; vol < (unsigned int)maxVolume; vol += 10*stepSize)
     {
       EXPECT_EQ(0, audio_device_->SetMicrophoneVolume(vol));
       EXPECT_EQ(0, audio_device_->MicrophoneVolume(&volume));
       CheckVolume(volume, vol);
     }
   }
 #endif
 
   // reinitialize kDefaultDevice and modify/retrieve the volume
   EXPECT_EQ(0, audio_device_->SetRecordingDevice(MACRO_DEFAULT_DEVICE));
@@ skipping 723 matching lines @@
   // TODO(kjellander): Fix so these tests pass on Mac.
 #if !defined(WEBRTC_MAC)
   EXPECT_EQ(0, audio_device_->InitPlayout());
   EXPECT_EQ(0, audio_device_->StartPlayout());
 #endif
 
   EXPECT_EQ(-1, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
 #endif
   EXPECT_EQ(0, audio_device_->StopPlayout());
 }