Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

chrome/browser/copresence/chrome_whispernet_client_browsertest.cc

 // Copyright 2014 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 "chrome/browser/copresence/chrome_whispernet_client.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <cstdlib>
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/audio_modem/public/audio_modem_types.h"
 #include "components/audio_modem/public/whispernet_client.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/base/audio_bus.h"
 #include "media/base/audio_converter.h"
 #include "media/base/audio_parameters.h"
 
 using audio_modem::WhispernetClient;
 using audio_modem::AUDIBLE;
 using audio_modem::INAUDIBLE;
 using audio_modem::TokenParameters;
@@ skipping 58 matching lines @@
   // manager seems to get initialized only *after* ExtensionBrowserTest::SetUp
   // has finished executing. Setting up a testing AudioMager causes the actual
   // create happening later in the browser initialization to fail. The only way
   // around this at the moment seems to be to have this method called from
   // every test before they try to decode.
   void SetupDecode() {
     // We get default parameters here instead of the constructor since
     // initializing Whispernet also creates our AudioManager. Initializing from
     // the test instead causes issues.
     default_params_ = media::AudioManager::Get()->GetInputStreamParameters(
-        media::AudioManagerBase::kDefaultDeviceId);
+        media::AudioDeviceDescription::kDefaultDeviceId);
 
     coder_params_ = media::AudioParameters(
         default_params_.format(), audio_modem::kDefaultChannelLayout,
         audio_modem::kDefaultSampleRate, audio_modem::kDefaultBitsPerSample,
         default_params_.frames_per_buffer());
 
     converter_.reset(new media::AudioConverter(
         coder_params_, default_params_,
         default_params_.sample_rate() == coder_params_.sample_rate()));
     converter_->AddInput(this);
@@ skipping 251 matching lines @@
 
   EncodeTokenAndSaveSamples(client_3.get(), true, kSixZeros, token_params);
   DecodeSamplesAndVerifyToken(client_3.get(), true, kSixZeros, token_params);
 
   const size_t kLongTokenLengths[2] = {8, 9};
   GetTokenParamsForLengths(kLongTokenLengths, token_params);
 
   EncodeTokenAndSaveSamples(client_2.get(), true, kEightZeros, token_params);
   DecodeSamplesAndVerifyToken(client_2.get(), true, kEightZeros, token_params);
 }