Make Demuxer::Stop() synchronous.

content/renderer/media/android/media_source_delegate.h

 // Copyright 2013 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_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 128 matching lines @@
 
   // Callback for ChunkDemuxer::Seek() and callback chain for resetting
   // decrypted audio/video streams if present.
   //
   // Runs on the media thread.
   void OnDemuxerSeekDone(media::PipelineStatus status);
   void ResetAudioDecryptingDemuxerStream();
   void ResetVideoDecryptingDemuxerStream();
   void FinishResettingDecryptingDemuxerStreams();
 
-  // Callback for ChunkDemuxer::Stop() and helper for deleting |this| on the
-  // main thread.
-  void OnDemuxerStopDone();
+  // Helper for deleting |this| on the main thread.
   void DeleteSelf();
 
   void OnDemuxerOpened();
   void OnNeedKey(const std::string& type,
                  const std::vector<uint8>& init_data);
   void NotifyDemuxerReady();
 
   void StopDemuxer();
   void InitializeDemuxer();
   void SeekInternal(const base::TimeDelta& seek_time);
@@ skipping 81 matching lines @@
   base::WeakPtrFactory<MediaSourceDelegate> main_weak_factory_;
   base::WeakPtrFactory<MediaSourceDelegate> media_weak_factory_;
   base::WeakPtr<MediaSourceDelegate> main_weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_