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

services/util/cpp/factory_service_base.h

Index: services/util/cpp/factory_service_base.h
diff --git a/services/util/cpp/factory_service_base.h b/services/util/cpp/factory_service_base.h
index 9a5ec4a1e3ac02d450e0a96bb106ebabc387fba2..33b46e783cdf91d30d6e27bed6c1a8c216cbcadb 100644
--- a/services/util/cpp/factory_service_base.h
+++ b/services/util/cpp/factory_service_base.h
@@ -27,8 +27,8 @@ class FactoryServiceBase : public ApplicationDelegate {
 
     // Returns the ApplicationImpl.
     ApplicationImpl* app() {
-      DCHECK(owner_->app_);
-      return owner_->app_;
+      DCHECK(owner_->app());
+      return owner_->app();
     }
 
     // Tells the factory service to release this product.
@@ -72,6 +72,8 @@ class FactoryServiceBase : public ApplicationDelegate {
 
   ~FactoryServiceBase() override;
 
+  ApplicationImpl* app() { return app_; }
+
   // ApplicationDelegate implementation.
   void Initialize(ApplicationImpl* app) override;