Change the NaCl loader and broker processes to use the ServiceManager.

chrome/browser/chrome_content_browser_manifest_overlay.json

 {
   "name": "content_browser",
   "display_name": "Chrome",
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "renderer": [
           "autofill::mojom::AutofillDriver",
           "autofill::mojom::PasswordManagerDriver",
           "extensions::StashService",
@@ skipping 18 matching lines @@
           "ash::mojom::VolumeController",
           "ash::mojom::VpnList",
           "keyboard::mojom::Keyboard"
         ],
         "mash:launchable": [
           "mash::mojom::Launchable"
         ]
       },
       "requires": {
         "ash": [ "ash" ],
-        "image_decoder": [ "decode" ]
+        "image_decoder": [ "decode" ],
+        "nacl_broker": [ "browser" ],
+        "nacl_loader": [ "browser" ]
       }
     },
     "navigation:frame": {
       "provides": {
         "renderer": [
           "autofill::mojom::AutofillDriver",
           "autofill::mojom::PasswordManagerDriver",
           "blink::mojom::ShareService",
           "bluetooth::mojom::AdapterFactory",
           "device::usb::ChooserService",
@@ skipping 11 matching lines @@
           // TODO(beng): These should be moved to a separate capability.
           "mojom::OmniboxPageHandler",
           "mojom::PluginsPageHandler",
           "mojom::SiteEngagementUIHandler",
           "mojom::UsbInternalsPageHandler"
         ]
       }
     }
   }
 }