Added automatic mode to FakeInputAudioStream to generate automatic beeps

content/browser/renderer_host/media/audio_input_device_manager.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_input_device_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/media_stream_request.h"
 #include "media/audio/audio_device_name.h"
 #include "media/audio/audio_input_ipc.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/channel_layout.h"
 #include "media/base/scoped_histogram_timer.h"
 
 namespace content {
 
 const int AudioInputDeviceManager::kFakeOpenSessionId = 1;
 
+const char kFakeDeviceName[] = "Fake Audio";
+const char kFakeDeviceId[] = "fake_audio";
+
 namespace {
 // Starting id for the first capture session.
 const int kFirstSessionId = AudioInputDeviceManager::kFakeOpenSessionId + 1;
 }
 
 AudioInputDeviceManager::AudioInputDeviceManager(
     media::AudioManager* audio_manager)
     : listener_(NULL),
       next_capture_session_id_(kFirstSessionId),
       use_fake_device_(false),
       audio_manager_(audio_manager) {
   // TODO(xians): Remove this fake_device after the unittests do not need it.
   StreamDeviceInfo fake_device(MEDIA_DEVICE_AUDIO_CAPTURE,
-                               media::AudioManagerBase::kDefaultDeviceName,
-                               media::AudioManagerBase::kDefaultDeviceId,
+                               kFakeDeviceName,
+                               kFakeDeviceId,
                                44100, media::CHANNEL_LAYOUT_STEREO,
                                0);
   fake_device.session_id = kFakeOpenSessionId;
   devices_.push_back(fake_device);
 }
 
 AudioInputDeviceManager::~AudioInputDeviceManager() {
 }
 
 const StreamDeviceInfo* AudioInputDeviceManager::GetOpenedDeviceInfoById(
@@ skipping 69 matching lines @@
 bool AudioInputDeviceManager::ShouldUseFakeDevice() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return use_fake_device_;
 }
 
 void AudioInputDeviceManager::EnumerateOnDeviceThread(
     MediaStreamType stream_type) {
   SCOPED_UMA_HISTOGRAM_TIMER(
       "Media.AudioInputDeviceManager.EnumerateOnDeviceThreadTime");
   DCHECK(IsOnDeviceThread());
+  DCHECK_EQ(MEDIA_DEVICE_AUDIO_CAPTURE, stream_type);
 
+  // Enumerate the devices on the OS.
+  // AudioManager is guaranteed to outlive MediaStreamManager in
+  // BrowserMainloop.
   media::AudioDeviceNames device_names;
-
-  switch (stream_type) {
-    case MEDIA_DEVICE_AUDIO_CAPTURE:
-      // AudioManager is guaranteed to outlive MediaStreamManager in
-      // BrowserMainloop.
-      audio_manager_->GetAudioInputDeviceNames(&device_names);
-      break;
-
-    default:
-      NOTREACHED();
-      break;
-  }
+  audio_manager_->GetAudioInputDeviceNames(&device_names);
 
   scoped_ptr<StreamDeviceInfoArray> devices(new StreamDeviceInfoArray());
   for (media::AudioDeviceNames::iterator it = device_names.begin();
        it != device_names.end(); ++it) {
     // Add device information to device vector.
     devices->push_back(StreamDeviceInfo(
         stream_type, it->device_name, it->unique_id));
   }
 
-  // If the |use_fake_device_| flag is on, inject the fake device if there is
-  // no available device on the OS.
   if (use_fake_device_ && devices->empty()) {
-    devices->push_back(StreamDeviceInfo(
-        stream_type, media::AudioManagerBase::kDefaultDeviceName,
-        media::AudioManagerBase::kDefaultDeviceId));
+    // Some unittests can mock the AudioManager enumeration APIs to inject
+    // their own fake devices, so we only inject the fake device if
+    // |use_fake_device_| flag is on and there is no enumerated device.
+    devices->push_back(StreamDeviceInfo(stream_type, kFakeDeviceName,

[DaleCurtis, 2014/05/02 20:20:09]

Won't this now put the fake device at the back of the devices list, so tests
would use a real device instead of the fake in most cases?

[no longer working on chromium, 2014/05/06 14:10:56]

That has been the change before this CL, and the whole fake devices/streams code
is a bit messy.

I did some more clean-up and hope it is improved a bit now, ptal.

+                                        kFakeDeviceId));
   }
 
   // Return the device list through the listener by posting a task on
   // IO thread since MediaStreamManager handles the callback asynchronously.
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&AudioInputDeviceManager::DevicesEnumeratedOnIOThread,
                  this, stream_type, base::Passed(&devices)));
 }
@@ skipping 84 matching lines @@
   for (StreamDeviceList::iterator i(devices_.begin()); i != devices_.end();
        ++i) {
     if (i->session_id == session_id)
       return i;
   }
 
   return devices_.end();
 }
 
 }  // namespace content