Replace remaining shell references with service manager

content/public/app/mojo/content_browser_manifest.json

 {
   "manifest_version": 1,
   "name": "service:content_browser",
   "process-group": "browser",
   "display_name": "Content (browser process)",
   "capabilities": {
     // Remove this once http://crbug.com/632818 is fixed.
     "provided": {
       "gpu": [ ],
       "plugin":  [ ],
@@ skipping 14 matching lines @@
         "content::mojom::URLLoaderFactory",
         "content::mojom::VideoCaptureHost",
         "device::BatteryMonitor",
         "device::mojom::LightSensor",
         "device::mojom::MotionSensor",
         "device::mojom::OrientationSensor",
         "device::mojom::TimeZoneMonitor",
         "media::mojom::ImageCapture",
         "memory_coordinator::mojom::MemoryCoordinatorHandle"
       ],
-      "shell:service_factory": [
+      "service_manager:service_factory": [
         "service_manager::mojom::ServiceFactory"
       ]
     },
     "required": {
       "*": [ "app" ],
       // In classic ash, the browser supplies ash interfaces to itself.
       "service:content_browser": [ "ash" ],
       "service:content_gpu": [ "browser" ],
       "service:content_plugin": [ "browser" ],
       "service:content_renderer": [ "browser" ],
       "service:content_utility": [ "browser" ],
-      "service:shell": [ "shell:client_process",
-                         "shell:instance_name",
-                         "shell:user_id" ],
+      "service:service_manager": [
+        "service_manager:client_process",
+        "service_manager:instance_name",
+        "service_manager:user_id"
+      ],
       "service:file": [ "file:filesystem", "file:leveldb" ],
       "service:media": [ "media:media" ]
     }
   }
 }