Revert of Refactor browser side navigator.connect code to not use MessagePortService.

content/browser/navigator_connect/navigator_connect_context_impl.cc

Index: content/browser/navigator_connect/navigator_connect_context_impl.cc
diff --git a/content/browser/navigator_connect/navigator_connect_context_impl.cc b/content/browser/navigator_connect/navigator_connect_context_impl.cc
index 9161b573ca0908e7e56b571137368417f174c963..94bdc82e7e64fd53297a5b806a017a62e638cfd3 100644
--- a/content/browser/navigator_connect/navigator_connect_context_impl.cc
+++ b/content/browser/navigator_connect/navigator_connect_context_impl.cc
@@ -4,39 +4,23 @@
 
 #include "content/browser/navigator_connect/navigator_connect_context_impl.h"
 
+#include "content/browser/message_port_message_filter.h"
 #include "content/browser/message_port_service.h"
 #include "content/browser/navigator_connect/service_port_service_impl.h"
-#include "content/browser/service_worker/service_worker_context_wrapper.h"
-#include "content/browser/service_worker/service_worker_utils.h"
-#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/message_port_provider.h"
 #include "content/public/browser/navigator_connect_service_factory.h"
 #include "content/public/common/navigator_connect_client.h"
 
 namespace content {
 
 struct NavigatorConnectContextImpl::Port {
-  // ID of this port.
-  int id;
-  // ID of the port this port is connected to.
-  int entangled_id;
-
-  // Service url and client origin describing this connection. These fields will
-  // always be the same as the same fields for the entangled port.
-  GURL target_url;
-  GURL client_origin;
-
+  int message_port_id;
   // Set to nullptr when the ServicePortService goes away.
   ServicePortServiceImpl* service;
-
-  // If this port is associated with a service worker, these fields store that
-  // information.
-  int64 service_worker_registration_id = kInvalidServiceWorkerRegistrationId;
-  GURL service_worker_registration_origin;
 };
 
-NavigatorConnectContextImpl::NavigatorConnectContextImpl(
-    const scoped_refptr<ServiceWorkerContextWrapper>& service_worker_context)
-    : service_worker_context_(service_worker_context), next_port_id_(0) {}
+NavigatorConnectContextImpl::NavigatorConnectContextImpl() {
+}
 
 NavigatorConnectContextImpl::~NavigatorConnectContextImpl() {
 }
@@ -62,107 +46,48 @@
     ServicePortServiceImpl* service_port_service,
     const ConnectCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  // Create a new message channel.
-  int client_port_id = next_port_id_++;
-  int service_port_id = next_port_id_++;
+  // Create a new message channel. Use |this| as delegate for both ports until
+  // the real delegate for the service port is known later on.
+  int client_port_id;
+  int service_port;
+  MessagePortProvider::CreateMessageChannel(this, &client_port_id,
+                                            &service_port);
+  // Hold messages send to the client while setting up connection.
+  MessagePortService::GetInstance()->HoldMessages(client_port_id);
 
   Port& client_port = ports_[client_port_id];
-  client_port.id = client_port_id;
-  client_port.entangled_id = service_port_id;
-  client_port.target_url = target_url;
-  client_port.client_origin = origin;
+  client_port.message_port_id = client_port_id;
   client_port.service = service_port_service;
 
-  Port& service_port = ports_[service_port_id];
-  service_port.id = service_port_id;
-  service_port.entangled_id = client_port_id;
-  service_port.target_url = target_url;
-  service_port.client_origin = origin;
+  // The message_port_id stored in the client object is the one associated with
+  // the service.
+  NavigatorConnectClient client(target_url, origin, service_port);
 
-  // Find the right service worker to service this connection.
-  service_worker_context_->FindRegistrationForDocument(
-      target_url,
-      base::Bind(&NavigatorConnectContextImpl::GotServiceWorkerRegistration,
-                 this, callback, client_port_id, service_port_id));
-}
-
-void NavigatorConnectContextImpl::PostMessage(
-    int sender_port_id,
-    const MessagePortMessage& message,
-    const std::vector<TransferredMessagePort>& sent_message_ports) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(ports_.find(sender_port_id) != ports_.end());
-  DCHECK(message.message_as_value.empty());
-
-  const Port& sender_port = ports_[sender_port_id];
-  DCHECK(ports_.find(sender_port.entangled_id) != ports_.end());
-  const Port& port = ports_[sender_port.entangled_id];
-
-  if (port.service_worker_registration_id !=
-      kInvalidServiceWorkerRegistrationId) {
-    // Port is associated with service worker, dispatch message event via
-    // ServiceWorkerVersion.
-
-    // Hold messages on transferred message ports. Actual delivery of the
-    // message by the service can be asynchronous. When a message is delivered,
-    // WebMessagePortChannelImpl instances will be constructed which send
-    // MessagePortHostMsg_ReleaseMessages to release messages.
-    for (const auto& sent_port : sent_message_ports)
-      MessagePortService::GetInstance()->HoldMessages(sent_port.id);
-
-    service_worker_context_->FindRegistrationForId(
-        port.service_worker_registration_id,
-        port.service_worker_registration_origin,
-        base::Bind(&NavigatorConnectContextImpl::DeliverMessage, this, port.id,
-                   message.message_as_string, sent_message_ports));
+  // Find factory to handle request, more recently added factories should take
+  // priority as per comment at NavigatorConnectContext::AddFactory..
+  NavigatorConnectServiceFactory* factory = nullptr;
+  for (auto it = service_factories_.rbegin(); it != service_factories_.rend();
+       ++it) {
+    if ((*it)->HandlesUrl(client.target_url)) {
+      factory = *it;
+      break;
+    }
   }
 
-  if (!port.service) {
-    // TODO(mek): Figure out what to do in this situation.
-    return;
-  }
-  port.service->PostMessageToClient(port.id, message, sent_message_ports);
-}
-
-void NavigatorConnectContextImpl::GotServiceWorkerRegistration(
-    const ConnectCallback& callback,
-    int client_port_id,
-    int service_port_id,
-    ServiceWorkerStatusCode status,
-    const scoped_refptr<ServiceWorkerRegistration>& registration) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(ports_.find(client_port_id) != ports_.end());
-  DCHECK(ports_.find(service_port_id) != ports_.end());
-
-  if (status != SERVICE_WORKER_OK) {
-    // No service worker found, reject connection attempt.
-    OnConnectResult(callback, client_port_id, service_port_id, registration,
-                     status, false, base::string16(), base::string16());
+  if (!factory) {
+    // No factories found.
+    OnConnectResult(client, client_port_id, callback, nullptr, false);
     return;
   }
 
-  ServiceWorkerVersion* active_version = registration->active_version();
-  if (!active_version) {
-    // No active version, reject connection attempt.
-    OnConnectResult(callback, client_port_id, service_port_id, registration,
-                     status, false, base::string16(), base::string16());
-    return;
-  }
-
-  Port& service_port = ports_[service_port_id];
-  service_port.service_worker_registration_id = registration->id();
-  service_port.service_worker_registration_origin =
-      registration->pattern().GetOrigin();
-
-  active_version->DispatchServicePortConnectEvent(
-      base::Bind(&NavigatorConnectContextImpl::OnConnectResult, this, callback,
-                 client_port_id, service_port_id, registration),
-      service_port.target_url, service_port.client_origin, service_port_id);
+  // Actually initiate connection.
+  factory->Connect(
+      client, base::Bind(&NavigatorConnectContextImpl::OnConnectResult, this,
+                         client, client_port_id, callback));
 }
 
 void NavigatorConnectContextImpl::ServicePortServiceDestroyed(
     ServicePortServiceImpl* service_port_service) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   for (auto& port : ports_) {
     if (port.second.service != service_port_service)
       continue;
@@ -173,55 +98,48 @@
   }
 }
 
+void NavigatorConnectContextImpl::SendMessage(
+    int route_id,
+    const MessagePortMessage& message,
+    const std::vector<TransferredMessagePort>& sent_message_ports) {
+  DCHECK(ports_.find(route_id) != ports_.end());
+  const Port& port = ports_[route_id];
+  if (!port.service) {
+    // TODO(mek): Figure out what to do in this situation.
+    return;
+  }
+
+  port.service->PostMessageToClient(route_id, message, sent_message_ports);
+}
+
+void NavigatorConnectContextImpl::SendMessagesAreQueued(int route_id) {
+  NOTREACHED() << "navigator.services endpoints should never queue messages.";
+}
+
 void NavigatorConnectContextImpl::OnConnectResult(
+    const NavigatorConnectClient& client,
+    int client_message_port_id,
     const ConnectCallback& callback,
-    int client_port_id,
-    int service_port_id,
-    const scoped_refptr<ServiceWorkerRegistration>& service_worker_registration,
-    ServiceWorkerStatusCode status,
-    bool accept_connection,
-    const base::string16& name,
-    const base::string16& data) {
+    MessagePortDelegate* delegate,
+    bool data_as_values) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (accept_connection) {
+  if (delegate) {
+    DCHECK(!data_as_values) << "Data as values is not currently implemented";
     // TODO(mek): Might have to do something else if the client connection got
     // severed while the service side connection was being set up.
-    callback.Run(client_port_id, true);
+
+    // Update service side port with delegate.
+    MessagePortService::GetInstance()->UpdateMessagePort(
+        client.message_port_id, delegate, client.message_port_id);
+    callback.Run(client_message_port_id, true);
+    MessagePortService::GetInstance()->ReleaseMessages(client_message_port_id);
   } else {
     // Destroy ports since connection failed.
-    ports_.erase(service_port_id);
-    ports_.erase(client_port_id);
+    MessagePortService::GetInstance()->Destroy(client.message_port_id);
+    MessagePortService::GetInstance()->Destroy(client_message_port_id);
+    ports_.erase(client_message_port_id);
     callback.Run(MSG_ROUTING_NONE, false);
   }
 }
 
-void NavigatorConnectContextImpl::DeliverMessage(
-    int port_id,
-    const base::string16& message,
-    const std::vector<TransferredMessagePort>& sent_message_ports,
-    ServiceWorkerStatusCode service_worker_status,
-    const scoped_refptr<ServiceWorkerRegistration>&
-        service_worker_registration) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(ports_.find(port_id) != ports_.end());
-
-  if (service_worker_status != SERVICE_WORKER_OK) {
-    // TODO(mek): Do something when no service worker was found.
-    return;
-  }
-
-  ServiceWorkerVersion* active_version =
-      service_worker_registration->active_version();
-  if (!active_version) {
-    // TODO(mek): Do something when no active version exists.
-    return;
-  }
-
-  const Port& port = ports_[port_id];
-  NavigatorConnectClient client(port.target_url, port.client_origin, port_id);
-  active_version->DispatchCrossOriginMessageEvent(
-      client, message, sent_message_ports,
-      base::Bind(&ServiceWorkerUtils::NoOpStatusCallback));
-}
-
 }  // namespace content