[GRC] UKM Support

content/public/app/mojo/content_browser_manifest.json

Index: content/public/app/mojo/content_browser_manifest.json
diff --git a/content/public/app/mojo/content_browser_manifest.json b/content/public/app/mojo/content_browser_manifest.json
index cfedb98a571b790f29c3a7bf1370c88233f99d66..9128297987a27b700c435ba3a6bb856e9215cf81 100644
--- a/content/public/app/mojo/content_browser_manifest.json
+++ b/content/public/app/mojo/content_browser_manifest.json
@@ -57,8 +57,10 @@
       },
       "requires": {
         "*": [ "app" ],
+	// TODO(matthalp,oysteine,holte) isolate ukm capabilities from the render
+	// capabilities and then replace the render capabilities with them
         // In classic ash, the browser supplies ash interfaces to itself.
-        "content_browser": [ "ash", "display", "memory_instrumentation" ],
+        "content_browser": [ "ash", "display", "memory_instrumentation", "renderer" ],
         "content_gpu": [ "browser" ],
         "content_plugin": [ "browser" ],
         "content_renderer": [ "browser" ],
@@ -83,9 +85,8 @@
           "barcode_detection",
           "face_detection",
           "text_detection"
-
         ],
-        "resource_coordinator": [ "coordination_unit" ],
+        "resource_coordinator": [ "coordination_unit", "service_callbacks" ],
         "video_capture": [ "capture" ]
       }
     },