Step two of optionally sending messages to/from message ports as base::Value.

content/browser/navigator_connect/navigator_connect_context_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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/public/browser/navigator_connect_service_factory.h"
 #include "content/public/common/navigator_connect_client.h"
@@ skipping 50 matching lines @@
   for (auto it = service_factories_.rbegin(); it != service_factories_.rend();
        ++it) {
     if ((*it)->HandlesUrl(client.target_url)) {
       factory = *it;
       break;
     }
   }
 
   if (!factory) {
     // No factories found.
-    // Destroy ports since connection failed.
-    message_port_service->Destroy(client_port);
-    message_port_service->Destroy(service_port);
-    callback.Run(MSG_ROUTING_NONE, MSG_ROUTING_NONE, false);
+    OnConnectResult(client, client_port, client_port_route_id,
+                    callback, nullptr);
     return;
   }
 
   // Actually initiate connection.
   factory->Connect(
       client, base::Bind(&NavigatorConnectContextImpl::OnConnectResult, this,
                          client, client_port, client_port_route_id, callback));
 }
 
 void NavigatorConnectContextImpl::OnConnectResult(
     const NavigatorConnectClient& client,
     int client_message_port_id,
     int client_port_route_id,
     const ConnectCallback& callback,
     MessagePortDelegate* delegate) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (delegate) {
     // Update service side port with delegate.
     MessagePortService::GetInstance()->UpdateMessagePort(
         client.message_port_id, delegate, client.message_port_id);
-    callback.Run(client_message_port_id, client_port_route_id, true);
+    TransferredMessagePort port;
+    port.id = client_message_port_id;
+    // TODO(mek): Set port.send_value_as_messages depending on connect result.
+    callback.Run(port, client_port_route_id, true);
   } else {
     // Destroy ports since connection failed.
     MessagePortService::GetInstance()->Destroy(client.message_port_id);
     MessagePortService::GetInstance()->Destroy(client_message_port_id);
-    callback.Run(MSG_ROUTING_NONE, MSG_ROUTING_NONE, false);
+    callback.Run(TransferredMessagePort(), MSG_ROUTING_NONE, false);
   }
 }
 
 }  // namespace content