Make AudioParameters a class instead of a struct

content/renderer/media/webrtc_audio_device_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/environment.h"
 #include "base/test/test_timeouts.h"
 #include "content/renderer/media/audio_hardware.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/test/webrtc_audio_device_test.h"
 #include "media/audio/audio_manager.h"
@@ skipping 14 matching lines @@
 namespace {
 
 ACTION_P(QuitMessageLoop, loop_or_proxy) {
   loop_or_proxy->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
 class AudioUtil : public AudioUtilInterface {
  public:
   AudioUtil() {}
 
-  virtual double GetAudioHardwareSampleRate() OVERRIDE {
+  virtual int GetAudioHardwareSampleRate() OVERRIDE {
     return media::GetAudioHardwareSampleRate();
   }
-  virtual double GetAudioInputHardwareSampleRate(
+  virtual int GetAudioInputHardwareSampleRate(
       const std::string& device_id) OVERRIDE {
     return media::GetAudioInputHardwareSampleRate(device_id);
   }
-  virtual uint32 GetAudioInputHardwareChannelCount(
+  virtual ChannelLayout GetAudioInputHardwareChannelLayout(
       const std::string& device_id) OVERRIDE {
-    return media::GetAudioInputHardwareChannelCount(device_id);
+    return media::GetAudioInputHardwareChannelLayout(device_id);
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioUtil);
 };
 
 class AudioUtilNoHardware : public AudioUtilInterface {
  public:
-  AudioUtilNoHardware(double output_rate, double input_rate,
-                      uint32 input_channels)
+  AudioUtilNoHardware(int output_rate, int input_rate,
+                      ChannelLayout input_channel_layout)
       : output_rate_(output_rate),
         input_rate_(input_rate),
-        input_channels_(input_channels) {
+        input_channel_layout_(input_channel_layout) {
   }
 
-  virtual double GetAudioHardwareSampleRate() OVERRIDE {
+  virtual int GetAudioHardwareSampleRate() OVERRIDE {
     return output_rate_;
   }
-  virtual double GetAudioInputHardwareSampleRate(
+  virtual int GetAudioInputHardwareSampleRate(
       const std::string& device_id) OVERRIDE {
     return input_rate_;
   }
-  virtual uint32 GetAudioInputHardwareChannelCount(
+  virtual ChannelLayout GetAudioInputHardwareChannelLayout(
       const std::string& device_id) OVERRIDE {
-    return input_channels_;
+    return input_channel_layout_;
   }
 
  private:
-  double output_rate_;
-  double input_rate_;
-  uint32 input_channels_;
+  int output_rate_;
+  int input_rate_;
+  ChannelLayout input_channel_layout_;
   DISALLOW_COPY_AND_ASSIGN(AudioUtilNoHardware);
 };
 
 bool IsRunningHeadless() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   if (env->HasVar("CHROME_HEADLESS"))
     return true;
   return false;
 }
 
@@ skipping 145 matching lines @@
   int invalid_rates[] = {-1, 0, 8000, 11025, 22050, 32000, 192000};
   for (size_t i = 0; i < arraysize(invalid_rates); ++i) {
     EXPECT_FALSE(FindElementInArray(valid_rates, arraysize(valid_rates),
         invalid_rates[i]));
   }
 }
 
 // Basic test that instantiates and initializes an instance of
 // WebRtcAudioDeviceImpl.
 TEST_F(WebRTCAudioDeviceTest, Construct) {
-  AudioUtilNoHardware audio_util(48000.0, 48000.0, 1);
+  AudioUtilNoHardware audio_util(48000, 48000, CHANNEL_LAYOUT_MONO);
   SetAudioUtilCallback(&audio_util);
   scoped_refptr<WebRtcAudioDeviceImpl> audio_device(
       new WebRtcAudioDeviceImpl());
 
   audio_device->SetSessionId(1);
 
   WebRTCAutoDelete<webrtc::VoiceEngine> engine(webrtc::VoiceEngine::Create());
   ASSERT_TRUE(engine.valid());
 
   ScopedWebRTCPtr<webrtc::VoEBase> base(engine.get());
@@ skipping 260 matching lines @@
                                 MessageLoop::QuitClosure(),
                                 TestTimeouts::action_timeout());
   message_loop_.Run();
 
   EXPECT_EQ(0, base->StopSend(ch));
   EXPECT_EQ(0, base->StopPlayout(ch));
 
   EXPECT_EQ(0, base->DeleteChannel(ch));
   EXPECT_EQ(0, base->Terminate());
 }