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

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

Issue 1987643002: Make default media device ID salts random by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change return type from const string to string as it makes no difference Created 4 years, 6 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/browser/renderer_host/media/audio_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 467e2be3645b9d8010a85a3cb2654f10efc9873c..f0b232dc977319db06d06cf60bbdc21e9a1600aa 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -66,13 +66,13 @@ class MockAudioRendererHost : public AudioRendererHost {
AudioMirroringManager* mirroring_manager,
MediaInternals* media_internals,
MediaStreamManager* media_stream_manager,
- const ResourceContext::SaltCallback& salt_callback)
+ const std::string& salt)
: AudioRendererHost(kRenderProcessId,
audio_manager,
mirroring_manager,
media_internals,
media_stream_manager,
- salt_callback),
+ salt),
shared_memory_length_(0) {}
// A list of mock methods.
@@ -170,18 +170,12 @@ class MockAudioRendererHost : public AudioRendererHost {
};
namespace {
-std::string ReturnMockSalt() {
- return std::string();
-}
-
-ResourceContext::SaltCallback GetMockSaltCallback() {
- return base::Bind(&ReturnMockSalt);
-}
void WaitForEnumeration(base::RunLoop* loop,
const AudioOutputDeviceEnumeration& e) {
loop->Quit();
}
+
} // namespace
class AudioRendererHostTest : public testing::Test {
@@ -202,10 +196,10 @@ class AudioRendererHostTest : public testing::Test {
base::Bind(&WaitForEnumeration, &run_loop));
run_loop.Run();
- host_ = new MockAudioRendererHost(audio_manager_.get(), &mirroring_manager_,
- MediaInternals::GetInstance(),
- media_stream_manager_.get(),
- GetMockSaltCallback());
+ host_ =
+ new MockAudioRendererHost(audio_manager_.get(), &mirroring_manager_,
+ MediaInternals::GetInstance(),
+ media_stream_manager_.get(), std::string());
// Simulate IPC channel connected.
host_->set_peer_process_for_testing(base::Process::Current());

Powered by Google App Engine
This is Rietveld 408576698