Add constructor taking group ID to MediaStreamDevice and StreamDeviceInfo

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 <memory>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 159 matching lines @@
     // Enumerate the devices on the OS.
     // AudioManager is guaranteed to outlive MediaStreamManager in
     // BrowserMainloop.
     audio_manager_->GetAudioInputDeviceNames(&device_names);
   }
 
   std::unique_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));
-  }
-  for (StreamDeviceInfo& device_info : *devices) {
-    device_info.device.group_id =
-        audio_manager_->GetGroupIDInput(device_info.device.id);
+    devices->emplace_back(stream_type, it->device_name, it->unique_id,
+                          audio_manager_->GetGroupIDInput(it->unique_id));
   }
 
   // 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)));
 }
 
 void AudioInputDeviceManager::OpenOnDeviceThread(
     int session_id, const StreamDeviceInfo& info) {
   SCOPED_UMA_HISTOGRAM_TIMER(
       "Media.AudioInputDeviceManager.OpenOnDeviceThreadTime");
   DCHECK(IsOnDeviceThread());
 
   StreamDeviceInfo out(info.device.type, info.device.name, info.device.id,
-                       0, 0, 0);
+                       info.device.group_id, 0, 0, 0);
   out.session_id = session_id;
 
   MediaStreamDevice::AudioDeviceParameters& input_params = out.device.input;
 
   if (use_fake_device_) {
     // Don't need to query the hardware information if using fake device.
     input_params.sample_rate = 44100;
     input_params.channel_layout = media::CHANNEL_LAYOUT_STEREO;
   } else {
     // Get the preferred sample rate and channel configuration for the
@@ skipping 89 matching lines @@
 #if defined(OS_CHROMEOS)
 void AudioInputDeviceManager::SetKeyboardMicStreamActiveOnUIThread(
     bool active) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   chromeos::CrasAudioHandler::Get()->SetKeyboardMicActive(active);
 }
 #endif
 
 
 }  // namespace content