Motown: Move framework/util/incident* so other services can use it

services/media/framework_ffmpeg/ffmpeg_demux.cc

 // Copyright 2016 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 <condition_variable>
 #include <map>
 #include <mutex>
 #include <thread>
 
 #include "base/logging.h"
-#include "services/media/framework/util/incident.h"
 #include "services/media/framework/util/safe_clone.h"
 #include "services/media/framework_ffmpeg/av_codec_context.h"
 #include "services/media/framework_ffmpeg/av_format_context.h"
 #include "services/media/framework_ffmpeg/av_io_context.h"
 #include "services/media/framework_ffmpeg/av_packet.h"
 #include "services/media/framework_ffmpeg/ffmpeg_demux.h"
+#include "services/util/cpp/incident.h"
 
 namespace mojo {
 namespace media {
 
 class FfmpegDemuxImpl : public FfmpegDemux {
  public:
   FfmpegDemuxImpl(std::shared_ptr<Reader> reader);
 
   ~FfmpegDemuxImpl() override;
 
@@ skipping 312 matching lines @@
   return index_;
 }
 
 std::unique_ptr<StreamType> FfmpegDemuxImpl::FfmpegDemuxStream::stream_type()
     const {
   return SafeClone(stream_type_);
 }
 
 }  // namespace media
 }  // namespace mojo