chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.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: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.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 | « chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc ('k') | chrome/browser/media/desktop_capture_access_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

index 79ababea97e6038db2dcc89c0faf81574149d6fd..84e173d13e8dd4242edaa08f37d9d1fd1c8dbf28 100644

--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

@@ -30,8 +30,8 @@

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

#include "extensions/common/permissions/permission_set.h"

#include "extensions/common/permissions/permissions_data.h"

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

#include "media/audio/audio_manager.h"

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

#include "net/test/embedded_test_server/embedded_test_server.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -199,9 +199,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcAudioPrivateTest, GetSinks) {

dict->GetString("sinkId", &sink_id);

std::string expected_id;

- if (it->unique_id.empty() ||

- it->unique_id == media::AudioManagerBase::kDefaultDeviceId) {

- expected_id = media::AudioManagerBase::kDefaultDeviceId;

+ if (media::AudioDeviceDescription::IsDefaultDevice(it->unique_id)) {

+ expected_id = media::AudioDeviceDescription::kDefaultDeviceId;

} else {

GetIDInOrigin(profile()->GetResourceContext(),

source_url_.GetOrigin(),