Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: content/renderer/media/user_media_client_impl_unittest.cc

Issue 2837873004: Revert of Initialize default audio device ID with explicit device ID. (patchset #4 id:170001 of htt… (Closed)
Patch Set: Created 3 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
Index: content/renderer/media/user_media_client_impl_unittest.cc
diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc
index f01ef2dc546bfa9c9bd4d1e102123093cd4f04a3..9735d97389a939bdd89a5aa20ef560c0465f2077 100644
--- a/content/renderer/media/user_media_client_impl_unittest.cc
+++ b/content/renderer/media/user_media_client_impl_unittest.cc
@@ -22,7 +22,6 @@
#include "content/renderer/media/mock_media_stream_dispatcher.h"
#include "content/renderer/media/mock_media_stream_video_source.h"
#include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
-#include "media/audio/audio_device_description.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaDeviceInfo.h"
@@ -901,12 +900,11 @@ TEST_F(UserMediaClientImplTest, CreateWithAllOptionalInvalidDeviceId) {
CreateDeviceConstraints(nullptr, kInvalidDeviceId, kInvalidDeviceId);
blink::WebMediaConstraints video_constraints =
CreateDeviceConstraints(nullptr, kInvalidDeviceId, kInvalidDeviceId);
+ // MockMediaStreamDispatcher uses empty string as default audio device ID.
// MockMediaDevicesDispatcher uses the first device in the enumeration as
// default video device ID.
- TestValidRequestWithConstraints(
- audio_constraints, video_constraints,
- std::string(media::AudioDeviceDescription::kDefaultDeviceId),
- kFakeVideoInputDeviceId1);
+ TestValidRequestWithConstraints(audio_constraints, video_constraints,
+ std::string(), kFakeVideoInputDeviceId1);
}
TEST_F(UserMediaClientImplTest, CreateWithFacingModeUser) {

Powered by Google App Engine
This is Rietveld 408576698