Refactor navigator.connect code to make it more flexible.

content/browser/navigator_connect/navigator_connect_dispatcher_host.h

Index: content/browser/navigator_connect/navigator_connect_dispatcher_host.h
diff --git a/content/browser/navigator_connect/navigator_connect_dispatcher_host.h b/content/browser/navigator_connect/navigator_connect_dispatcher_host.h
index 86350a7d5f744d5d9f7662489938c6b31919fcf3..a41cbd7e2318bfe9ad28ef31bbfdf15e3dda52ec 100644
--- a/content/browser/navigator_connect/navigator_connect_dispatcher_host.h
+++ b/content/browser/navigator_connect/navigator_connect_dispatcher_host.h
@@ -5,17 +5,14 @@
 #ifndef CONTENT_BROWSER_NAVIGATOR_CONNECT_NAVIGATOR_CONNECT_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_NAVIGATOR_CONNECT_NAVIGATOR_CONNECT_DISPATCHER_HOST_H_
 
-#include "content/common/service_worker/service_worker_status_code.h"
 #include "content/public/browser/browser_message_filter.h"
 
 class GURL;
 
 namespace content {
 
-struct CrossOriginServiceWorkerClient;
-class NavigatorConnectContext;
-class ServiceWorkerContextWrapper;
-class ServiceWorkerRegistration;
+struct NavigatorConnectClient;
+class NavigatorConnectContextImpl;
 
 // Receives navigator.connect connection attempts from a child process.
 // Attempts to find a service that serves the URL the connection is made to
@@ -27,9 +24,8 @@ class ServiceWorkerRegistration;
 // if it is still handling a connection attempt).
 class NavigatorConnectDispatcherHost : public BrowserMessageFilter {
  public:
-  NavigatorConnectDispatcherHost(
-      const scoped_refptr<ServiceWorkerContextWrapper>& service_worker_context,
-      const scoped_refptr<NavigatorConnectContext>& navigator_connect_context);
+  explicit NavigatorConnectDispatcherHost(const scoped_refptr<
+      NavigatorConnectContextImpl>& navigator_connect_context);
 
  private:
   ~NavigatorConnectDispatcherHost() override;
@@ -40,29 +36,16 @@ class NavigatorConnectDispatcherHost : public BrowserMessageFilter {
   // IPC Message handlers.
   void OnConnect(int thread_id,
                  int request_id,
-                 const CrossOriginServiceWorkerClient& client);
-
-  // Callback called when the Service Worker context found (or didn't find) a
-  // service worker registration to serve a particular URL.
-  void GotServiceWorkerRegistration(
-      int thread_id,
-      int request_id,
-      const CrossOriginServiceWorkerClient& client,
-      ServiceWorkerStatusCode status,
-      const scoped_refptr<ServiceWorkerRegistration>& registration);
+                 const NavigatorConnectClient& client);
 
   // Callback called when the service worker finished handling the cross origin
   // connection event.
   void OnConnectResult(
       int thread_id,
       int request_id,
-      const CrossOriginServiceWorkerClient& client,
-      const scoped_refptr<ServiceWorkerRegistration>& registration,
-      ServiceWorkerStatusCode status,
       bool accept_connection);
 
-  scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
-  scoped_refptr<NavigatorConnectContext> navigator_connect_context_;
+  scoped_refptr<NavigatorConnectContextImpl> navigator_connect_context_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigatorConnectDispatcherHost);
 };