content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc - Issue 1892433002: Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc

Issue 1892433002: Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: another rebase Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/audio_output_device_enumerator.cc ('k') | content/browser/renderer_host/media/audio_renderer_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc

diff --git a/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc b/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc

index c84a6845b0a08445398d9ea204fcca5179a07d30..b3cac0b1a1b798cd33153fe4d0babb7867a6bdaa 100644

--- a/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc

+++ b/content/browser/renderer_host/media/audio_output_device_enumerator_unittest.cc

@@ -15,7 +15,7 @@

#include "base/strings/string_number_conversions.h"

#include "base/thread_task_runner_handle.h"

#include "content/public/test/test_browser_thread_bundle.h"

-#include "media/audio/audio_manager_base.h"

+#include "media/audio/audio_device_description.h"

#include "media/audio/fake_audio_log_factory.h"

#include "media/audio/fake_audio_manager.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -44,9 +44,7 @@ class MockAudioManager : public media::FakeAudioManager {

DCHECK(device_names->empty());

MockGetAudioOutputDeviceNames(device_names);

if (num_devices_ > 0) {

- device_names->push_back(

- media::AudioDeviceName(AudioManager::GetDefaultDeviceName(),

- AudioManagerBase::kDefaultDeviceId));

+ device_names->push_back(media::AudioDeviceName::CreateDefault());

for (size_t i = 0; i < num_devices_; i++) {

device_names->push_back(

media::AudioDeviceName("FakeDeviceName_" + base::IntToString(i),

@@ -70,9 +68,7 @@ class OnlyDefaultDeviceAudioManager : public MockAudioManager {

media::AudioDeviceNames* device_names) override {

DCHECK(device_names->empty());

MockGetAudioOutputDeviceNames(device_names);

- device_names->push_front(

- media::AudioDeviceName(AudioManager::GetDefaultDeviceName(),

- AudioManagerBase::kDefaultDeviceId));

+ device_names->push_front(media::AudioDeviceName::CreateDefault());

}

private: