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

content/browser/navigator_connect/navigator_connect_context_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_NAVIGATOR_CONNECT_NAVIGATOR_CONNECT_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_NAVIGATOR_CONNECT_NAVIGATOR_CONNECT_CONTEXT_IMPL_H_
 
 #include <map>
 #include "base/callback_forward.h"
 #include "base/memory/scoped_vector.h"
 #include "content/public/browser/message_port_delegate.h"
 #include "content/public/browser/navigator_connect_context.h"
 
 namespace content {
 
 class MessagePortMessageFilter;
-struct NavigatorConnectClient;
 class NavigatorConnectService;
 class NavigatorConnectServiceFactory;
+struct NavigatorConnectClient;
+struct TransferredMessagePort;
 
 // Tracks all active navigator.connect connections, as well as available service
 // factories. Delegates connection requests to the correct factory and passes
 // messages on to the correct service.
 // One instance of this class exists per StoragePartition.
 // TODO(mek): Somehow clean up connections when the client side goes away.
 class NavigatorConnectContextImpl : public NavigatorConnectContext {
  public:
-  using ConnectCallback = base::Callback<
-      void(int message_port_id, int message_port_route_id, bool success)>;
+  using ConnectCallback =
+      base::Callback<void(const TransferredMessagePort& message_port,
+                          int message_port_route_id,
+                          bool success)>;
 
   explicit NavigatorConnectContextImpl();
 
   // Called when a new connection request comes in from a client. Finds the
   // correct service factory and passes the connection request off to there.
   // Can call the callback before this method call returns.
   void Connect(NavigatorConnectClient client,
                MessagePortMessageFilter* message_port_message_filter,
                const ConnectCallback& callback);
 
@@ skipping 12 matching lines @@
                        const ConnectCallback& callback,
                        MessagePortDelegate* delegate);
 
   // List of factories to try to handle URLs.
   ScopedVector<NavigatorConnectServiceFactory> service_factories_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_NAVIGATOR_CONNECT_NAVIGATOR_CONNECT_CONTEXT_IMPL_H_