Revert of Move getUserMedia finish to "when audio track configured".

content/renderer/media/media_stream_audio_track.cc

 // Copyright 2014 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/renderer/media/media_stream_audio_track.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "content/public/renderer/media_stream_audio_sink.h"
 #include "media/base/audio_bus.h"
@@ skipping 100 matching lines @@
   deliverer_.GetConsumerList(&sinks_to_end);
   for (MediaStreamAudioSink* sink : sinks_to_end) {
     deliverer_.RemoveConsumer(sink);
     sink->OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
   }
 
   weak_factory_.InvalidateWeakPtrs();
 }
 
 void MediaStreamAudioTrack::OnSetFormat(const media::AudioParameters& params) {
-  base::OnceCallback<void()> temp_callback;
-  // Call the callback if present, but don't hold a lock while doing so.
-  {
-    base::AutoLock guard(format_set_guard_);
-    format_is_set_ = true;
-    if (!format_set_callback_.is_null()) {
-      temp_callback = std::move(format_set_callback_);
-    }
-  }
-  if (!temp_callback.is_null()) {
-    std::move(temp_callback).Run();
-  }
   deliverer_.OnSetFormat(params);
 }
 
 void MediaStreamAudioTrack::OnData(const media::AudioBus& audio_bus,
                                    base::TimeTicks reference_time) {
   // Note: Using NoBarrier_Load because the timing of when the audio thread sees
   // a changed |is_enabled_| value can be relaxed.
   const bool deliver_data = !!base::subtle::NoBarrier_Load(&is_enabled_);
 
   if (deliver_data) {
     deliverer_.OnData(audio_bus, reference_time);
   } else {
     // The W3C spec requires silent audio to flow while a track is disabled.
     if (!silent_bus_ || silent_bus_->channels() != audio_bus.channels() ||
         silent_bus_->frames() != audio_bus.frames()) {
       silent_bus_ = media::AudioBus::Create(audio_bus.channels(),
                                             audio_bus.frames());
       silent_bus_->Zero();
     }
     deliverer_.OnData(*silent_bus_, reference_time);
   }
 }
 
-bool MediaStreamAudioTrack::format_is_set() {
-  base::AutoLock guard(format_set_guard_);
-  return format_is_set_;
-}
-
 void MediaStreamAudioTrack::getSettings(
     blink::WebMediaStreamTrack::Settings& settings) {
-  DCHECK(format_is_set());
+  // TODO(hta): Extract the real value.
+  settings.deviceId = blink::WebString("audio device ID");
 }
 
 }  // namespace content