Move CancellationFlag and WaitableEvent to the synchronization subdirectory....

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2010 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.
 
 // Implements the Demuxer interface using FFmpeg's libavformat.  At this time
 // will support demuxing any audio/video format thrown at it.  The streams
 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
 // key FFmpegCodecID which contains the CodecID enumeration value.  The CodecIDs
 // can be used to create and initialize the corresponding FFmpeg decoder.
 //
 // FFmpegDemuxer sets the duration of pipeline during initialization by using
 // the duration of the longest audio/video stream.
 //
 // NOTE: since FFmpegDemuxer reads packets sequentially without seeking, media
 // files with very large drift between audio/video streams may result in
 // excessive memory consumption.
 //
 // When stopped, FFmpegDemuxer and FFmpegDemuxerStream release all callbacks
 // and buffered packets.  Reads from a stopped FFmpegDemuxerStream will not be
 // replied to.
 
 #ifndef MEDIA_FILTERS_FFMPEG_DEMUXER_H_
 #define MEDIA_FILTERS_FFMPEG_DEMUXER_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
-#include "base/waitable_event.h"
+#include "base/synchronization/waitable_event.h"
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
 #include "media/base/media_format.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "media/filters/ffmpeg_interfaces.h"
 
 // FFmpeg forward declarations.
 struct AVFormatContext;
 struct AVPacket;
 struct AVRational;
@@ skipping 179 matching lines @@
 
   size_t last_read_bytes_;
   int64 read_position_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_