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

services/util/cpp/test/incident_test.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 "services/media/framework/test/test_base.h"
-#include "services/media/framework/util/incident.h"
+#include "services/util/cpp/incident.h"
+#include "services/util/cpp/test/test_base.h"
 
 namespace mojo {
-namespace media {
 namespace {
 
 class IncidentTest : public TestBase {};
 
 // Tests whether Incident::Occur and Incident::Reset have the right effect on
 // Incident::occurred.
 TEST_F(IncidentTest, Basics) {
   Incident under_test;
 
   EXPECT_FALSE(under_test.occurred());
@@ skipping 189 matching lines @@
 
   {
     ThreadsafeIncident under_test;
     under_test.When([&consequence_ran]() { consequence_ran = true; });
   }
 
   EXPECT_FALSE(consequence_ran);
 }
 
 }  // namespace
-}  // namespace media
 }  // namespace mojo