Refactor navigator.connect code to make it more flexible.

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index e5f40c49df315be90985403a2285daf5c5517490..39acf3dabc301a66708d68280659d07912da33d5 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -92,6 +92,8 @@ class DevToolsManagerDelegate;
 class ExternalVideoSurfaceContainer;
 class LocationProvider;
 class MediaObserver;
+class NavigatorConnectContext;
+class NavigatorConnectServiceFactory;
 class PlatformNotificationService;
 class QuotaPermissionContext;
 class RenderFrameHost;
@@ -588,6 +590,11 @@ class CONTENT_EXPORT ContentBrowserClient {
   // RenderProcessHost.
   virtual void OverrideRenderProcessMojoServices(ServiceRegistry* registry) {}
 
+  // Registers additional navigator.connect service factories available in a
+  // particular NavigatorConnectContext.
+  virtual void GetAdditionalNavigatorConnectServices(
+      const scoped_refptr<NavigatorConnectContext>& context) {}
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Populates |mappings| with all files that need to be mapped before launching
   // a child process.