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

content/renderer/media/media_stream_audio_track.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_TRACK_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_TRACK_H_
 
 #include <memory>
 
 #include "base/atomicops.h"
-#include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "content/renderer/media/media_stream_audio_deliverer.h"
 #include "content/renderer/media/media_stream_track.h"
 
 namespace content {
 
@@ skipping 44 matching lines @@
 
   // MediaStreamTrack override.
   void SetEnabled(bool enabled) override;
   void SetContentHint(
       blink::WebMediaStreamTrack::ContentHintType content_hint) override;
 
   // Returns a unique class identifier. Some subclasses override and use this
   // method to provide safe down-casting to their type.
   virtual void* GetClassIdentifier() const;
 
-  void SetFormatConfiguredCallback(base::OnceCallback<void()> callback) {
-    base::AutoLock guard(format_set_guard_);
-    format_set_callback_ = std::move(callback);
-  }
-
  private:
   friend class MediaStreamAudioSource;
   friend class MediaStreamAudioDeliverer<MediaStreamAudioTrack>;
 
   // Called by MediaStreamAudioSource to notify this track that the flow of
   // audio data has started from the source. |stop_callback| is run by Stop()
   // when the source must halt the flow of audio data to this track.
   void Start(const base::Closure& stop_callback);
 
   // Called by the MediaStreamAudioDeliverer to notify this track of an audio
   // format change. In turn, all MediaStreamAudioSinks will be notified before
   // the next chunk of audio is delivered to them.
   void OnSetFormat(const media::AudioParameters& params);
 
   // Called by the MediaStreamAudioDeliverer to deliver audio data to this
   // track, which in turn delivers the audio to one or more
   // MediaStreamAudioSinks. While this track is disabled, silent audio will be
   // delivered to the sinks instead of the content of |audio_bus|.
   void OnData(const media::AudioBus& audio_bus, base::TimeTicks reference_time);
 
   void getSettings(blink::WebMediaStreamTrack::Settings& settings) override;
 
  private:
-  bool format_is_set();
-
   // In debug builds, check that all methods that could cause object graph
   // or data flow changes are being called on the main thread.
   base::ThreadChecker thread_checker_;
 
   // Callback provided to Start() which is run when the audio flow must halt.
   base::Closure stop_callback_;
 
   // Manages sinks connected to this track and the audio format and data flow.
   MediaStreamAudioDeliverer<MediaStreamAudioSink> deliverer_;
 
   // While false (0), silent audio is delivered to the sinks.
   base::subtle::Atomic32 is_enabled_;
 
   // Buffer used to deliver silent audio data while this track is disabled.
   std::unique_ptr<media::AudioBus> silent_bus_;
 
-  // True if the track knows its configuration (OnSetFormat has been called).
-  bool format_is_set_ = false;
-  base::OnceCallback<void()> format_set_callback_;
-  base::Lock format_set_guard_;
-
   // Provides weak pointers that are valid until Stop() is called.
   base::WeakPtrFactory<MediaStreamAudioTrack> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioTrack);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_TRACK_H_