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

services/media/factory_service/media_demux_impl.h

 // 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.
 
 #ifndef MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DEMUX_IMPL_H_
 #define MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DEMUX_IMPL_H_
 
 #include <cstdint>
 #include <memory>
 #include <vector>
 
 #include "base/single_thread_task_runner.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/media/core/interfaces/media_demux.mojom.h"
 #include "mojo/services/media/core/interfaces/seeking_reader.mojom.h"
 #include "services/media/common/mojo_publisher.h"
 #include "services/media/factory_service/factory_service.h"
 #include "services/media/framework/graph.h"
 #include "services/media/framework/parts/demux.h"
-#include "services/media/framework/util/incident.h"
 #include "services/media/framework_mojo/mojo_producer.h"
+#include "services/util/cpp/incident.h"
 
 namespace mojo {
 namespace media {
 
 // Mojo agent that decodes a stream.
 class MediaDemuxImpl : public MediaFactoryService::Product<MediaDemux>,
                        public MediaDemux {
  public:
   static std::shared_ptr<MediaDemuxImpl> Create(
       InterfaceHandle<SeekingReader> reader,
@@ skipping 60 matching lines @@
   std::shared_ptr<Demux> demux_;
   Incident init_complete_;
   std::vector<std::unique_ptr<Stream>> streams_;
   MojoPublisher<GetMetadataCallback> metadata_publisher_;
 };
 
 }  // namespace media
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_MEDIA_FACTORY_MEDIA_DEMUX_IMPL_H_