Make the mojom files under //mojo/services/network/interfaces basically the same as the ones in the mojo repo.
Now, as far as I know, the only difference is that the ones in the mojo
repo still have "public".
* Add the appropriate directory to the import path, so that
"third_party/..." is no longer needed in imports.
* Add the DartPackage="mojo_services" annotation to module statements.
* Remove one spurious import.
The BUILD.gn file isn't the same. I'll ponder ways of fixing this, but
it's not a super high priority.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1397363005 .
diff --git a/mojo/services/network/interfaces/BUILD.gn b/mojo/services/network/interfaces/BUILD.gn
index 32634cd..2c00d50 100644
--- a/mojo/services/network/interfaces/BUILD.gn
+++ b/mojo/services/network/interfaces/BUILD.gn
@@ -27,5 +27,8 @@
"//third_party/mojo/src/mojo/public/interfaces/network",
]
- import_dirs = [ get_path_info("../../", "abspath") ]
+ import_dirs = [
+ get_path_info("../../", "abspath"),
+ "//third_party/mojo/src",
+ ]
}
diff --git a/mojo/services/network/interfaces/cookie_store.mojom b/mojo/services/network/interfaces/cookie_store.mojom
index 92a4241..ac90e53 100644
--- a/mojo/services/network/interfaces/cookie_store.mojom
+++ b/mojo/services/network/interfaces/cookie_store.mojom
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
interface CookieStore {
diff --git a/mojo/services/network/interfaces/host_resolver.mojom b/mojo/services/network/interfaces/host_resolver.mojom
index 2643fef..848e750 100644
--- a/mojo/services/network/interfaces/host_resolver.mojom
+++ b/mojo/services/network/interfaces/host_resolver.mojom
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
+import "mojo/public/interfaces/network/network_error.mojom";
import "network/interfaces/net_address.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
interface HostResolver {
// Get the list of IP addresses for host.
diff --git a/mojo/services/network/interfaces/http_connection.mojom b/mojo/services/network/interfaces/http_connection.mojom
index 119513e..38d39aa 100644
--- a/mojo/services/network/interfaces/http_connection.mojom
+++ b/mojo/services/network/interfaces/http_connection.mojom
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
+import "mojo/public/interfaces/network/network_error.mojom";
import "network/interfaces/http_message.mojom";
import "network/interfaces/web_socket.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
interface HttpConnection {
// Sets the OS send buffer size (in bytes) for the underlying socket.
diff --git a/mojo/services/network/interfaces/http_message.mojom b/mojo/services/network/interfaces/http_message.mojom
index bba72cf..b1093d2 100644
--- a/mojo/services/network/interfaces/http_message.mojom
+++ b/mojo/services/network/interfaces/http_message.mojom
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
-import "third_party/mojo/src/mojo/public/interfaces/network/http_header.mojom";
+import "mojo/public/interfaces/network/http_header.mojom";
struct HttpRequest {
string method = "GET";
diff --git a/mojo/services/network/interfaces/http_server.mojom b/mojo/services/network/interfaces/http_server.mojom
index 789f482..685e592 100644
--- a/mojo/services/network/interfaces/http_server.mojom
+++ b/mojo/services/network/interfaces/http_server.mojom
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
import "network/interfaces/http_connection.mojom";
diff --git a/mojo/services/network/interfaces/net_address.mojom b/mojo/services/network/interfaces/net_address.mojom
index e91973b..3ec6afb 100644
--- a/mojo/services/network/interfaces/net_address.mojom
+++ b/mojo/services/network/interfaces/net_address.mojom
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
enum NetAddressFamily {
diff --git a/mojo/services/network/interfaces/network_service.mojom b/mojo/services/network/interfaces/network_service.mojom
index 5737ca9..c1f957c 100644
--- a/mojo/services/network/interfaces/network_service.mojom
+++ b/mojo/services/network/interfaces/network_service.mojom
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
+import "mojo/public/interfaces/network/network_error.mojom";
import "network/interfaces/cookie_store.mojom";
import "network/interfaces/host_resolver.mojom";
import "network/interfaces/http_server.mojom";
@@ -14,7 +16,6 @@
import "network/interfaces/url_loader.mojom";
import "network/interfaces/url_loader_interceptor.mojom";
import "network/interfaces/web_socket.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
// TODO Darin suggests that this should probably be two classes. One for
// high-level origin-build requests like WebSockets and HTTP, and the other for
diff --git a/mojo/services/network/interfaces/tcp_bound_socket.mojom b/mojo/services/network/interfaces/tcp_bound_socket.mojom
index bd2568a..f48a01b 100644
--- a/mojo/services/network/interfaces/tcp_bound_socket.mojom
+++ b/mojo/services/network/interfaces/tcp_bound_socket.mojom
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
+import "mojo/public/interfaces/network/network_error.mojom";
import "network/interfaces/net_address.mojom";
import "network/interfaces/tcp_connected_socket.mojom";
import "network/interfaces/tcp_server_socket.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
// Represents a TCP socket that is bound to a local address and port, but
// is not yet in a listening or connected state.
diff --git a/mojo/services/network/interfaces/tcp_connected_socket.mojom b/mojo/services/network/interfaces/tcp_connected_socket.mojom
index 3f0c160..acd8c30 100644
--- a/mojo/services/network/interfaces/tcp_connected_socket.mojom
+++ b/mojo/services/network/interfaces/tcp_connected_socket.mojom
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
// Represents a TCP socket connected to a remote system.
diff --git a/mojo/services/network/interfaces/tcp_server_socket.mojom b/mojo/services/network/interfaces/tcp_server_socket.mojom
index fa9082d..ae16f56 100644
--- a/mojo/services/network/interfaces/tcp_server_socket.mojom
+++ b/mojo/services/network/interfaces/tcp_server_socket.mojom
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
+import "mojo/public/interfaces/network/network_error.mojom";
import "network/interfaces/net_address.mojom";
import "network/interfaces/tcp_connected_socket.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
// Represents a TCP server socket listening for incoming requests.
interface TCPServerSocket {
diff --git a/mojo/services/network/interfaces/udp_socket.mojom b/mojo/services/network/interfaces/udp_socket.mojom
index 78d4b1b..73d1af7 100644
--- a/mojo/services/network/interfaces/udp_socket.mojom
+++ b/mojo/services/network/interfaces/udp_socket.mojom
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
+import "mojo/public/interfaces/network/network_error.mojom";
import "network/interfaces/net_address.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
// UDPSocket and UDPSocketReceiver represent a UDP socket and its client. The
// typical flow of using the interfaces is:
diff --git a/mojo/services/network/interfaces/url_loader.mojom b/mojo/services/network/interfaces/url_loader.mojom
index 65528a3..ea99f3b 100644
--- a/mojo/services/network/interfaces/url_loader.mojom
+++ b/mojo/services/network/interfaces/url_loader.mojom
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
-import "network/interfaces/http_message.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/url_request.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/url_response.mojom";
+import "mojo/public/interfaces/network/network_error.mojom";
+import "mojo/public/interfaces/network/url_request.mojom";
+import "mojo/public/interfaces/network/url_response.mojom";
struct URLLoaderStatus {
// If the loader has failed due to a network level error, this field will be
diff --git a/mojo/services/network/interfaces/url_loader_interceptor.mojom b/mojo/services/network/interfaces/url_loader_interceptor.mojom
index 823ecd5..6524157 100644
--- a/mojo/services/network/interfaces/url_loader_interceptor.mojom
+++ b/mojo/services/network/interfaces/url_loader_interceptor.mojom
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
-import "third_party/mojo/src/mojo/public/interfaces/network/url_request.mojom";
-import "third_party/mojo/src/mojo/public/interfaces/network/url_response.mojom";
+import "mojo/public/interfaces/network/url_request.mojom";
+import "mojo/public/interfaces/network/url_response.mojom";
// Factory for |URLLoaderInterceptor|. The factory is called once per URLLoader
// and will be associated to it.
diff --git a/mojo/services/network/interfaces/web_socket.mojom b/mojo/services/network/interfaces/web_socket.mojom
index 72c41ff..f588035 100644
--- a/mojo/services/network/interfaces/web_socket.mojom
+++ b/mojo/services/network/interfaces/web_socket.mojom
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+[DartPackage="mojo_services"]
module mojo;
-import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
+import "mojo/public/interfaces/network/network_error.mojom";
interface WebSocket {
enum MessageType {
