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

services/util/cpp/incident.h

Index: services/util/cpp/incident.h
diff --git a/services/media/framework/util/incident.h b/services/util/cpp/incident.h
similarity index 95%
rename from services/media/framework/util/incident.h
rename to services/util/cpp/incident.h
index 378a58ffe47e7b63728796085caee09a9687644f..26f87e7e1c565b8efb99910a069e74fa10f28254 100644
--- a/services/media/framework/util/incident.h
+++ b/services/util/cpp/incident.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_INCIDENT_H_
-#define MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_INCIDENT_H_
+#ifndef MOJO_SERVICES_UTIL_CPP_INCIDENT_H_
+#define MOJO_SERVICES_UTIL_CPP_INCIDENT_H_
 
 #include <functional>
 #include <vector>
@@ -11,7 +11,6 @@
 #include "base/synchronization/lock.h"
 
 namespace mojo {
-namespace media {
 
 // The Incident class provides a facility for executing code as the consequence
 // of some occurrence. This can be useful for building state machines and
@@ -145,7 +144,6 @@ class ThreadsafeIncident {
   std::vector<std::function<void()>> consequences_;
 };
 
-}  // namespace media
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_INCIDENT_H_
+#endif  // MOJO_SERVICES_UTIL_CPP_INCIDENT_H_