Reland of Make default media device ID salts random by default

content/browser/renderer_host/media/audio_renderer_host_unittest.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/media/audio_renderer_host.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 48 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioMirroringManager);
 };
 
 class MockAudioRendererHost : public AudioRendererHost {
  public:
   MockAudioRendererHost(media::AudioManager* audio_manager,
                         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.
   MOCK_METHOD4(OnDeviceAuthorized,
                void(int stream_id,
                     media::OutputDeviceStatus device_status,
                     const media::AudioParameters& output_params,
                     const std::string& matched_device_id));
   MOCK_METHOD2(OnStreamCreated, void(int stream_id, int length));
   MOCK_METHOD1(OnStreamPlaying, void(int stream_id));
@@ skipping 77 matching lines @@
   }
 
   std::unique_ptr<base::SharedMemory> shared_memory_;
   std::unique_ptr<base::SyncSocket> sync_socket_;
   uint32_t shared_memory_length_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAudioRendererHost);
 };
 
 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 {
  public:
   AudioRendererHostTest() {
     audio_manager_ = media::AudioManager::CreateForTesting(
         base::ThreadTaskRunnerHandle::Get());
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFakeDeviceForMediaStream);
     media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
 
     // Enable caching to make enumerations run in a single thread
     media_stream_manager_->audio_output_device_enumerator()->SetCachePolicy(
         AudioOutputDeviceEnumerator::CACHE_POLICY_MANUAL_INVALIDATION);
     base::RunLoop().RunUntilIdle();
     base::RunLoop run_loop;
     media_stream_manager_->audio_output_device_enumerator()->Enumerate(
         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());
   }
 
   ~AudioRendererHostTest() override {
     // Simulate closing the IPC channel and give the audio thread time to close
     // the underlying streams.
     host_->OnChannelClosing();
     SyncWithAudioThread();
@@ skipping 188 matching lines @@
 }
 
 TEST_F(AudioRendererHostTest, CreateInvalidDevice) {
   Create(false, kInvalidDeviceId, url::Origin(GURL(kSecurityOrigin)));
   Close();
 }
 
 // TODO(hclam): Add tests for data conversation in low latency mode.
 
 }  // namespace content