Restructure public side of network service.

mojo/services/public/interfaces/network/network_service.mojom

Index: mojo/services/public/interfaces/network/network_service.mojom
diff --git a/mojo/services/public/interfaces/network/network_service.mojom b/mojo/services/public/interfaces/network/network_service.mojom
deleted file mode 100644
index e79dfb55bf817a6acaf08260ded70e2603011ad8..0000000000000000000000000000000000000000
--- a/mojo/services/public/interfaces/network/network_service.mojom
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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.
-
-module mojo;
-
-import "mojo/services/public/interfaces/network/cookie_store.mojom";
-import "mojo/services/public/interfaces/network/net_address.mojom";
-import "mojo/services/public/interfaces/network/network_error.mojom";
-import "mojo/services/public/interfaces/network/tcp_bound_socket.mojom";
-import "mojo/services/public/interfaces/network/tcp_connected_socket.mojom";
-import "mojo/services/public/interfaces/network/udp_socket.mojom";
-import "mojo/services/public/interfaces/network/url_loader.mojom";
-import "mojo/services/public/interfaces/network/web_socket.mojom";
-
-// TODO Darin suggfests that this should probably be two classes. One for
-// high-level origin-build requests like WebSockets and HTTP, and the other for
-// non-origin-bound low-level stuff like DNS, UDP, and TCP.
-interface NetworkService {
-  CreateURLLoader(URLLoader& loader);
-
-  GetCookieStore(CookieStore& cookie_store);
-
-  CreateWebSocket(WebSocket& socket);
-
-  // Creates a TCP socket bound to a given local address. This bound socket
-  // can be used for creating a client or server socket on that local address.
-  //
-  // If you want to create a client socket to connect to a server and are in
-  // the common case where you don't care about the local address it's bound
-  // to, use CreateTCPConnectedSocket.
-  //
-  // The local address can specify 0 for the port to specify that the OS should
-  // pick an available port for the given address, or it can pass 0 for the
-  // address and port for the OS to pick both the local address and port. In
-  // all success cases, the resulting local address will be passed to the
-  // callback as bound_to.
-  CreateTCPBoundSocket(NetAddress? local_address,
-                       TCPBoundSocket& bound_socket)
-      => (NetworkError result, NetAddress? bound_to);
-
-  // Creates a client socket connected to the given remote address. A local
-  // address and port will be allocated for the connection and passed to the
-  // callback on success.
-  //
-  // If you want control over the local address and port, instead use
-  // CreateTCPBoundSocket.
-  //
-  // IMPORTANT: This does not work yet! We need to add a new parameter to
-  // indicate the protocol type (IPv4 or IPv6) actually be able to create the
-  // right type of socket. We also need to figure out how the client is supposed
-  // to decide between IPv4 and IPv6 on a given system.
-  CreateTCPConnectedSocket(NetAddress remote_address,
-                           handle<data_pipe_consumer> send_stream,
-                           handle<data_pipe_producer> receive_stream,
-                           TCPConnectedSocket& client_socket)
-      => (NetworkError result,
-          NetAddress? local_address);
-
-  CreateUDPSocket(UDPSocket& socket);
-};