Restructure public side of network service.
This CL goes from this:
//mojo/services/public/cpp/network
//mojo/services/public/interfaces/network
to this:
//mojo/services/network/public/cpp
//mojo/services/network/public/interfaces
This CL also makes the Mojo-side changes required to roll this change into
Chromium.
TBR=beng
Review URL: https://codereview.chromium.org/789243002
diff --git a/examples/js/README.md b/examples/js/README.md
index 3dcee69..280e682 100644
--- a/examples/js/README.md
+++ b/examples/js/README.md
@@ -101,7 +101,7 @@
service you need the JS module based on network_service.mojom:
define("main", [
- "mojo/services/public/interfaces/network/network_service.mojom",
+ "mojo/services/network/public/interfaces/network_service.mojom",
"mojo/services/public/js/application",
]
function(netModule, appModule) {
diff --git a/examples/js/wget.js b/examples/js/wget.js
index 44d3a94..efd83b2 100644
--- a/examples/js/wget.js
+++ b/examples/js/wget.js
@@ -9,8 +9,8 @@
define("main", [
"console",
"mojo/public/js/core",
- "mojo/services/public/interfaces/network/network_service.mojom",
- "mojo/services/public/interfaces/network/url_loader.mojom",
+ "mojo/services/network/public/interfaces/network_service.mojom",
+ "mojo/services/network/public/interfaces/url_loader.mojom",
"mojo/services/public/js/application",
], function(console, coreModule, netModule, loaderModule, appModule) {
diff --git a/examples/pdf_viewer/BUILD.gn b/examples/pdf_viewer/BUILD.gn
index 23a42d8..9300797 100644
--- a/examples/pdf_viewer/BUILD.gn
+++ b/examples/pdf_viewer/BUILD.gn
@@ -15,9 +15,9 @@
"//mojo/application:content_handler",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
+ "//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/content_handler",
"//mojo/services/public/interfaces/input_events",
- "//mojo/services/public/interfaces/network",
"//mojo/services/view_manager/public/cpp",
"//third_party/pdfium",
]
diff --git a/examples/png_viewer/BUILD.gn b/examples/png_viewer/BUILD.gn
index 073b8ab..97e322d 100644
--- a/examples/png_viewer/BUILD.gn
+++ b/examples/png_viewer/BUILD.gn
@@ -16,8 +16,8 @@
"//mojo/application:content_handler",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
+ "//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/content_handler",
- "//mojo/services/public/interfaces/network",
"//mojo/services/view_manager/public/cpp",
"//ui/gfx",
]
diff --git a/examples/recursive_content_handler/BUILD.gn b/examples/recursive_content_handler/BUILD.gn
index 4d6a157..9adc61c 100644
--- a/examples/recursive_content_handler/BUILD.gn
+++ b/examples/recursive_content_handler/BUILD.gn
@@ -15,7 +15,7 @@
"//mojo/application:content_handler",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
+ "//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/content_handler",
- "//mojo/services/public/interfaces/network",
]
}
diff --git a/examples/wget/BUILD.gn b/examples/wget/BUILD.gn
index f55ff61..59b2d60 100644
--- a/examples/wget/BUILD.gn
+++ b/examples/wget/BUILD.gn
@@ -9,7 +9,7 @@
"//mojo/public/cpp/application:standalone",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
]
sources = [
diff --git a/examples/wget/wget.cc b/examples/wget/wget.cc
index 5b9e5ca..fc1cf9a 100644
--- a/examples/wget/wget.cc
+++ b/examples/wget/wget.cc
@@ -9,8 +9,8 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_runner.h"
#include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
namespace mojo {
namespace examples {
diff --git a/mojo/application/BUILD.gn b/mojo/application/BUILD.gn
index 73ac67f..d5be491 100644
--- a/mojo/application/BUILD.gn
+++ b/mojo/application/BUILD.gn
@@ -31,8 +31,8 @@
"//mojo/common",
"//mojo/environment:chromium",
"//mojo/public/interfaces/application",
+ "//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/content_handler",
- "//mojo/services/public/interfaces/network",
]
}
diff --git a/mojo/application/content_handler_factory.h b/mojo/application/content_handler_factory.h
index a24f5a6..3f4737a 100644
--- a/mojo/application/content_handler_factory.h
+++ b/mojo/application/content_handler_factory.h
@@ -8,8 +8,8 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
namespace mojo {
diff --git a/mojo/application_manager/BUILD.gn b/mojo/application_manager/BUILD.gn
index 4aecdb8..ab0fd9b 100644
--- a/mojo/application_manager/BUILD.gn
+++ b/mojo/application_manager/BUILD.gn
@@ -23,7 +23,7 @@
"//base",
"//mojo/common",
"//mojo/public/interfaces/application:application",
- "//mojo/services/public/interfaces/network:network",
+ "//mojo/services/network/public/interfaces",
"//url",
]
deps = [
diff --git a/mojo/application_manager/application_loader.h b/mojo/application_manager/application_loader.h
index d1267cc..a1d16bd 100644
--- a/mojo/application_manager/application_loader.h
+++ b/mojo/application_manager/application_loader.h
@@ -8,7 +8,7 @@
#include "base/callback.h"
#include "mojo/application_manager/application_manager_export.h"
#include "mojo/public/cpp/system/core.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "url/gurl.h"
namespace mojo {
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 160855d..87f5882 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -7,6 +7,7 @@
group("services") {
deps = [
"//mojo/services/network",
+ "//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/accessibility",
"//mojo/services/public/interfaces/clipboard",
"//mojo/services/public/interfaces/content_handler",
@@ -14,7 +15,6 @@
"//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/native_viewport",
"//mojo/services/public/interfaces/navigation",
- "//mojo/services/public/interfaces/network",
"//mojo/services/surfaces/public/interfaces",
]
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
index 3fc3431..83202f4 100644
--- a/mojo/services/network/BUILD.gn
+++ b/mojo/services/network/BUILD.gn
@@ -76,8 +76,8 @@
"//mojo/common",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
- "//mojo/services/public/cpp/network",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/cpp",
+ "//mojo/services/network/public/interfaces",
"//net",
"//url",
]
@@ -96,8 +96,8 @@
"//mojo/application",
"//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/bindings:bindings",
- "//mojo/services/public/cpp/network",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/cpp",
+ "//mojo/services/network/public/interfaces",
]
}
@@ -116,8 +116,8 @@
"//mojo/application:test_support",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/bindings:callback",
- "//mojo/services/public/cpp/network",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/cpp",
+ "//mojo/services/network/public/interfaces",
"//net",
"//testing/gtest",
]
diff --git a/mojo/services/network/cookie_store_impl.h b/mojo/services/network/cookie_store_impl.h
index 5bb4d2d..e3e9711 100644
--- a/mojo/services/network/cookie_store_impl.h
+++ b/mojo/services/network/cookie_store_impl.h
@@ -5,7 +5,7 @@
#ifndef MOJO_SERVICES_NETWORK_COOKIE_STORE_IMPL_H_
#define MOJO_SERVICES_NETWORK_COOKIE_STORE_IMPL_H_
-#include "mojo/services/public/interfaces/network/cookie_store.mojom.h"
+#include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
#include "url/gurl.h"
namespace mojo {
diff --git a/mojo/services/network/net_adapters.h b/mojo/services/network/net_adapters.h
index ea6317e..a5308ce 100644
--- a/mojo/services/network/net_adapters.h
+++ b/mojo/services/network/net_adapters.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "mojo/services/public/interfaces/network/network_error.mojom.h"
+#include "mojo/services/network/public/interfaces/network_error.mojom.h"
#include "net/base/io_buffer.h"
namespace mojo {
diff --git a/mojo/services/network/net_address_type_converters.h b/mojo/services/network/net_address_type_converters.h
index 8ac63e3..f999908 100644
--- a/mojo/services/network/net_address_type_converters.h
+++ b/mojo/services/network/net_address_type_converters.h
@@ -6,7 +6,7 @@
#define MOJO_SERVICES_NETWORK_NET_ADDRESS_TYPE_CONVERTERS_H_
#include "mojo/public/cpp/bindings/type_converter.h"
-#include "mojo/services/public/interfaces/network/net_address.mojom.h"
+#include "mojo/services/network/public/interfaces/net_address.mojom.h"
#include "net/base/ip_endpoint.h"
namespace mojo {
diff --git a/mojo/services/network/network_service_impl.h b/mojo/services/network/network_service_impl.h
index 5d3376a..c3bebe4 100644
--- a/mojo/services/network/network_service_impl.h
+++ b/mojo/services/network/network_service_impl.h
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "url/gurl.h"
namespace mojo {
diff --git a/mojo/services/public/cpp/network/BUILD.gn b/mojo/services/network/public/cpp/BUILD.gn
similarity index 87%
rename from mojo/services/public/cpp/network/BUILD.gn
rename to mojo/services/network/public/cpp/BUILD.gn
index 5f6ab06..565f715 100644
--- a/mojo/services/public/cpp/network/BUILD.gn
+++ b/mojo/services/network/public/cpp/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-source_set("network") {
+source_set("cpp") {
sources = [
"udp_socket_wrapper.cc",
"udp_socket_wrapper.h",
@@ -19,6 +19,6 @@
"//mojo/environment:chromium",
"//mojo/public/c/system",
"//mojo/public/cpp/system",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
]
}
diff --git a/mojo/services/public/cpp/network/udp_socket_wrapper.cc b/mojo/services/network/public/cpp/udp_socket_wrapper.cc
similarity index 98%
rename from mojo/services/public/cpp/network/udp_socket_wrapper.cc
rename to mojo/services/network/public/cpp/udp_socket_wrapper.cc
index b594f72..ae8fb1f 100644
--- a/mojo/services/public/cpp/network/udp_socket_wrapper.cc
+++ b/mojo/services/network/public/cpp/udp_socket_wrapper.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/public/cpp/network/udp_socket_wrapper.h"
+#include "mojo/services/network/public/cpp/udp_socket_wrapper.h"
#include <assert.h>
diff --git a/mojo/services/public/cpp/network/udp_socket_wrapper.h b/mojo/services/network/public/cpp/udp_socket_wrapper.h
similarity index 94%
rename from mojo/services/public/cpp/network/udp_socket_wrapper.h
rename to mojo/services/network/public/cpp/udp_socket_wrapper.h
index b2eda8d..c95fd31 100644
--- a/mojo/services/public/cpp/network/udp_socket_wrapper.h
+++ b/mojo/services/network/public/cpp/udp_socket_wrapper.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_PUBLIC_CPP_NETWORK_UDP_SOCKET_WRAPPER_H_
-#define MOJO_SERVICES_PUBLIC_CPP_NETWORK_UDP_SOCKET_WRAPPER_H_
+#ifndef MOJO_SERVICES_NETWORK_PUBLIC_CPP_UDP_SOCKET_WRAPPER_H_
+#define MOJO_SERVICES_NETWORK_PUBLIC_CPP_UDP_SOCKET_WRAPPER_H_
#include <queue>
-#include "mojo/services/public/interfaces/network/udp_socket.mojom.h"
+#include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
namespace mojo {
@@ -142,4 +142,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_PUBLIC_CPP_NETWORK_UDP_SOCKET_WRAPPER_H_
+#endif // MOJO_SERVICES_NETWORK_PUBLIC_CPP_UDP_SOCKET_WRAPPER_H_
diff --git a/mojo/services/public/cpp/network/web_socket_read_queue.cc b/mojo/services/network/public/cpp/web_socket_read_queue.cc
similarity index 96%
rename from mojo/services/public/cpp/network/web_socket_read_queue.cc
rename to mojo/services/network/public/cpp/web_socket_read_queue.cc
index 66b5a66..b52c3a1 100644
--- a/mojo/services/public/cpp/network/web_socket_read_queue.cc
+++ b/mojo/services/network/public/cpp/web_socket_read_queue.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/public/cpp/network/web_socket_read_queue.h"
+#include "mojo/services/network/public/cpp/web_socket_read_queue.h"
#include "base/bind.h"
diff --git a/mojo/services/public/cpp/network/web_socket_read_queue.h b/mojo/services/network/public/cpp/web_socket_read_queue.h
similarity index 85%
rename from mojo/services/public/cpp/network/web_socket_read_queue.h
rename to mojo/services/network/public/cpp/web_socket_read_queue.h
index 6108e49..905f94e 100644
--- a/mojo/services/public/cpp/network/web_socket_read_queue.h
+++ b/mojo/services/network/public/cpp/web_socket_read_queue.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_PUBLIC_CPP_NETWORK_WEB_SOCKET_READ_QUEUE_H_
-#define MOJO_SERVICES_PUBLIC_CPP_NETWORK_WEB_SOCKET_READ_QUEUE_H_
+#ifndef MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_READ_QUEUE_H_
+#define MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_READ_QUEUE_H_
#include "base/callback.h"
#include "base/memory/scoped_vector.h"
@@ -39,4 +39,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_PUBLIC_CPP_NETWORK_WEB_SOCKET_READ_QUEUE_H_
+#endif // MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_READ_QUEUE_H_
diff --git a/mojo/services/public/cpp/network/web_socket_write_queue.cc b/mojo/services/network/public/cpp/web_socket_write_queue.cc
similarity index 96%
rename from mojo/services/public/cpp/network/web_socket_write_queue.cc
rename to mojo/services/network/public/cpp/web_socket_write_queue.cc
index fe3f674..3f2f820 100644
--- a/mojo/services/public/cpp/network/web_socket_write_queue.cc
+++ b/mojo/services/network/public/cpp/web_socket_write_queue.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/public/cpp/network/web_socket_write_queue.h"
+#include "mojo/services/network/public/cpp/web_socket_write_queue.h"
#include "base/bind.h"
diff --git a/mojo/services/public/cpp/network/web_socket_write_queue.h b/mojo/services/network/public/cpp/web_socket_write_queue.h
similarity index 85%
rename from mojo/services/public/cpp/network/web_socket_write_queue.h
rename to mojo/services/network/public/cpp/web_socket_write_queue.h
index 7d5f5fa..e683be4 100644
--- a/mojo/services/public/cpp/network/web_socket_write_queue.h
+++ b/mojo/services/network/public/cpp/web_socket_write_queue.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_PUBLIC_CPP_NETWORK_WEB_SOCKET_WRITE_QUEUE_H_
-#define MOJO_SERVICES_PUBLIC_CPP_NETWORK_WEB_SOCKET_WRITE_QUEUE_H_
+#ifndef MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_WRITE_QUEUE_H_
+#define MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_WRITE_QUEUE_H_
#include "base/callback.h"
#include "base/memory/scoped_vector.h"
@@ -41,4 +41,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_PUBLIC_CPP_NETWORK_WEB_SOCKET_WRITE_QUEUE_H_
+#endif // MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_WRITE_QUEUE_H_
diff --git a/mojo/services/public/interfaces/network/BUILD.gn b/mojo/services/network/public/interfaces/BUILD.gn
similarity index 95%
rename from mojo/services/public/interfaces/network/BUILD.gn
rename to mojo/services/network/public/interfaces/BUILD.gn
index 1ce3591..1902f13 100644
--- a/mojo/services/public/interfaces/network/BUILD.gn
+++ b/mojo/services/network/public/interfaces/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
-mojom("network") {
+mojom("interfaces") {
sources = [
"cookie_store.mojom",
"net_address.mojom",
diff --git a/mojo/services/public/interfaces/network/cookie_store.mojom b/mojo/services/network/public/interfaces/cookie_store.mojom
similarity index 100%
rename from mojo/services/public/interfaces/network/cookie_store.mojom
rename to mojo/services/network/public/interfaces/cookie_store.mojom
diff --git a/mojo/services/public/interfaces/network/net_address.mojom b/mojo/services/network/public/interfaces/net_address.mojom
similarity index 100%
rename from mojo/services/public/interfaces/network/net_address.mojom
rename to mojo/services/network/public/interfaces/net_address.mojom
diff --git a/mojo/services/public/interfaces/network/network_error.mojom b/mojo/services/network/public/interfaces/network_error.mojom
similarity index 100%
rename from mojo/services/public/interfaces/network/network_error.mojom
rename to mojo/services/network/public/interfaces/network_error.mojom
diff --git a/mojo/services/public/interfaces/network/network_service.mojom b/mojo/services/network/public/interfaces/network_service.mojom
similarity index 82%
rename from mojo/services/public/interfaces/network/network_service.mojom
rename to mojo/services/network/public/interfaces/network_service.mojom
index e79dfb5..5996ffc 100644
--- a/mojo/services/public/interfaces/network/network_service.mojom
+++ b/mojo/services/network/public/interfaces/network_service.mojom
@@ -4,14 +4,14 @@
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";
+import "mojo/services/network/public/interfaces/cookie_store.mojom";
+import "mojo/services/network/public/interfaces/net_address.mojom";
+import "mojo/services/network/public/interfaces/network_error.mojom";
+import "mojo/services/network/public/interfaces/tcp_bound_socket.mojom";
+import "mojo/services/network/public/interfaces/tcp_connected_socket.mojom";
+import "mojo/services/network/public/interfaces/udp_socket.mojom";
+import "mojo/services/network/public/interfaces/url_loader.mojom";
+import "mojo/services/network/public/interfaces/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
diff --git a/mojo/services/public/interfaces/network/tcp_bound_socket.mojom b/mojo/services/network/public/interfaces/tcp_bound_socket.mojom
similarity index 85%
rename from mojo/services/public/interfaces/network/tcp_bound_socket.mojom
rename to mojo/services/network/public/interfaces/tcp_bound_socket.mojom
index afcc1eb..af79ad4 100644
--- a/mojo/services/public/interfaces/network/tcp_bound_socket.mojom
+++ b/mojo/services/network/public/interfaces/tcp_bound_socket.mojom
@@ -4,10 +4,10 @@
module mojo;
-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_connected_socket.mojom";
-import "mojo/services/public/interfaces/network/tcp_server_socket.mojom";
+import "mojo/services/network/public/interfaces/net_address.mojom";
+import "mojo/services/network/public/interfaces/network_error.mojom";
+import "mojo/services/network/public/interfaces/tcp_connected_socket.mojom";
+import "mojo/services/network/public/interfaces/tcp_server_socket.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/public/interfaces/network/tcp_connected_socket.mojom b/mojo/services/network/public/interfaces/tcp_connected_socket.mojom
similarity index 100%
rename from mojo/services/public/interfaces/network/tcp_connected_socket.mojom
rename to mojo/services/network/public/interfaces/tcp_connected_socket.mojom
diff --git a/mojo/services/public/interfaces/network/tcp_server_socket.mojom b/mojo/services/network/public/interfaces/tcp_server_socket.mojom
similarity index 82%
rename from mojo/services/public/interfaces/network/tcp_server_socket.mojom
rename to mojo/services/network/public/interfaces/tcp_server_socket.mojom
index 406098f..c37d95f 100644
--- a/mojo/services/public/interfaces/network/tcp_server_socket.mojom
+++ b/mojo/services/network/public/interfaces/tcp_server_socket.mojom
@@ -4,9 +4,9 @@
module mojo;
-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_connected_socket.mojom";
+import "mojo/services/network/public/interfaces/net_address.mojom";
+import "mojo/services/network/public/interfaces/network_error.mojom";
+import "mojo/services/network/public/interfaces/tcp_connected_socket.mojom";
// Represents a TCP server socket listening for incoming requests.
interface TCPServerSocket {
diff --git a/mojo/services/public/interfaces/network/udp_socket.mojom b/mojo/services/network/public/interfaces/udp_socket.mojom
similarity index 96%
rename from mojo/services/public/interfaces/network/udp_socket.mojom
rename to mojo/services/network/public/interfaces/udp_socket.mojom
index eed6c7c..0d74e28 100644
--- a/mojo/services/public/interfaces/network/udp_socket.mojom
+++ b/mojo/services/network/public/interfaces/udp_socket.mojom
@@ -4,8 +4,8 @@
module mojo;
-import "mojo/services/public/interfaces/network/net_address.mojom";
-import "mojo/services/public/interfaces/network/network_error.mojom";
+import "mojo/services/network/public/interfaces/net_address.mojom";
+import "mojo/services/network/public/interfaces/network_error.mojom";
// UDPSocket and UDPSocketClient represent a UDP socket and its client. The
// typical flow of using the interfaces is:
diff --git a/mojo/services/public/interfaces/network/url_loader.mojom b/mojo/services/network/public/interfaces/url_loader.mojom
similarity index 97%
rename from mojo/services/public/interfaces/network/url_loader.mojom
rename to mojo/services/network/public/interfaces/url_loader.mojom
index c1d2bd3..09774fc 100644
--- a/mojo/services/public/interfaces/network/url_loader.mojom
+++ b/mojo/services/network/public/interfaces/url_loader.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/network/network_error.mojom";
+import "mojo/services/network/public/interfaces/network_error.mojom";
struct URLRequest {
// The URL to load.
diff --git a/mojo/services/public/interfaces/network/web_socket.mojom b/mojo/services/network/public/interfaces/web_socket.mojom
similarity index 96%
rename from mojo/services/public/interfaces/network/web_socket.mojom
rename to mojo/services/network/public/interfaces/web_socket.mojom
index a91ab41..ee64aac 100644
--- a/mojo/services/public/interfaces/network/web_socket.mojom
+++ b/mojo/services/network/public/interfaces/web_socket.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/network/network_error.mojom";
+import "mojo/services/network/public/interfaces/network_error.mojom";
interface WebSocket {
enum MessageType {
diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/network/tcp_bound_socket_impl.h
index 3dc4646..bb2fe67 100644
--- a/mojo/services/network/tcp_bound_socket_impl.h
+++ b/mojo/services/network/tcp_bound_socket_impl.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
-#include "mojo/services/public/interfaces/network/tcp_bound_socket.mojom.h"
+#include "mojo/services/network/public/interfaces/tcp_bound_socket.mojom.h"
#include "net/socket/tcp_socket.h"
namespace mojo {
diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h
index 993802f..041f858 100644
--- a/mojo/services/network/tcp_connected_socket_impl.h
+++ b/mojo/services/network/tcp_connected_socket_impl.h
@@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/common/handle_watcher.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
-#include "mojo/services/public/interfaces/network/tcp_connected_socket.mojom.h"
+#include "mojo/services/network/public/interfaces/tcp_connected_socket.mojom.h"
#include "net/socket/tcp_socket.h"
namespace mojo {
diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/network/tcp_server_socket_impl.h
index 26d4942..0009951 100644
--- a/mojo/services/network/tcp_server_socket_impl.h
+++ b/mojo/services/network/tcp_server_socket_impl.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
-#include "mojo/services/public/interfaces/network/tcp_server_socket.mojom.h"
+#include "mojo/services/network/public/interfaces/tcp_server_socket.mojom.h"
#include "net/base/ip_endpoint.h"
#include "net/socket/tcp_socket.h"
diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc
index b003dab..079ed8f 100644
--- a/mojo/services/network/udp_socket_apptest.cc
+++ b/mojo/services/network/udp_socket_apptest.cc
@@ -9,9 +9,9 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/bindings/callback.h"
-#include "mojo/services/public/cpp/network/udp_socket_wrapper.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
-#include "mojo/services/public/interfaces/network/udp_socket.mojom.h"
+#include "mojo/services/network/public/cpp/udp_socket_wrapper.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp_socket_impl.h
index 1235716..81951da 100644
--- a/mojo/services/network/udp_socket_impl.h
+++ b/mojo/services/network/udp_socket_impl.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
-#include "mojo/services/public/interfaces/network/udp_socket.mojom.h"
+#include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
#include "net/base/ip_endpoint.h"
#include "net/udp/udp_server_socket.h"
diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h
index dec48d5..54d7f2a 100644
--- a/mojo/services/network/url_loader_impl.h
+++ b/mojo/services/network/url_loader_impl.h
@@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/common/handle_watcher.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "net/base/net_errors.h"
#include "net/url_request/url_request.h"
diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc
index ea0928f..ba09b7e 100644
--- a/mojo/services/network/web_socket_impl.cc
+++ b/mojo/services/network/web_socket_impl.cc
@@ -8,8 +8,8 @@
#include "base/message_loop/message_loop.h"
#include "mojo/common/handle_watcher.h"
#include "mojo/services/network/network_context.h"
-#include "mojo/services/public/cpp/network/web_socket_read_queue.h"
-#include "mojo/services/public/cpp/network/web_socket_write_queue.h"
+#include "mojo/services/network/public/cpp/web_socket_read_queue.h"
+#include "mojo/services/network/public/cpp/web_socket_write_queue.h"
#include "net/websockets/websocket_channel.h"
#include "net/websockets/websocket_errors.h"
#include "net/websockets/websocket_event_interface.h"
diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web_socket_impl.h
index a12ebf8..457f4ff 100644
--- a/mojo/services/network/web_socket_impl.h
+++ b/mojo/services/network/web_socket_impl.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
-#include "mojo/services/public/interfaces/network/web_socket.mojom.h"
+#include "mojo/services/network/public/interfaces/web_socket.mojom.h"
namespace net {
class WebSocketChannel;
diff --git a/mojo/services/public/interfaces/content_handler/BUILD.gn b/mojo/services/public/interfaces/content_handler/BUILD.gn
index c2d67da..5c54276 100644
--- a/mojo/services/public/interfaces/content_handler/BUILD.gn
+++ b/mojo/services/public/interfaces/content_handler/BUILD.gn
@@ -11,6 +11,6 @@
deps = [
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
]
}
diff --git a/mojo/services/public/interfaces/content_handler/content_handler.mojom b/mojo/services/public/interfaces/content_handler/content_handler.mojom
index 39704ee..76af219 100644
--- a/mojo/services/public/interfaces/content_handler/content_handler.mojom
+++ b/mojo/services/public/interfaces/content_handler/content_handler.mojom
@@ -5,7 +5,7 @@
module mojo;
import "mojo/public/interfaces/application/shell.mojom";
-import "mojo/services/public/interfaces/network/url_loader.mojom";
+import "mojo/services/network/public/interfaces/url_loader.mojom";
interface ContentHandler {
StartApplication(Shell shell, URLResponse response);
diff --git a/mojo/services/public/interfaces/navigation/BUILD.gn b/mojo/services/public/interfaces/navigation/BUILD.gn
index 28fa59e..f2336d3 100644
--- a/mojo/services/public/interfaces/navigation/BUILD.gn
+++ b/mojo/services/public/interfaces/navigation/BUILD.gn
@@ -10,6 +10,6 @@
]
deps = [
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
]
}
diff --git a/mojo/services/public/interfaces/navigation/navigation.mojom b/mojo/services/public/interfaces/navigation/navigation.mojom
index 47d0e8e..668892d 100644
--- a/mojo/services/public/interfaces/navigation/navigation.mojom
+++ b/mojo/services/public/interfaces/navigation/navigation.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/network/url_loader.mojom";
+import "mojo/services/network/public/interfaces/url_loader.mojom";
// Expresses a preference for where a navigation will be performed.
enum Target {
diff --git a/mojo/services/public/mojo_services_public.gyp b/mojo/services/public/mojo_services_public.gyp
index a164736..495c215 100644
--- a/mojo/services/public/mojo_services_public.gyp
+++ b/mojo/services/public/mojo_services_public.gyp
@@ -152,20 +152,20 @@
],
},
{
- # GN version: //mojo/services/public/interfaces/network
+ # GN version: //mojo/services/network/public/interfaces
'target_name': 'mojo_network_bindings',
'type': 'static_library',
'sources': [
- 'interfaces/network/cookie_store.mojom',
- 'interfaces/network/net_address.mojom',
- 'interfaces/network/network_error.mojom',
- 'interfaces/network/network_service.mojom',
- 'interfaces/network/tcp_bound_socket.mojom',
- 'interfaces/network/tcp_connected_socket.mojom',
- 'interfaces/network/tcp_server_socket.mojom',
- 'interfaces/network/udp_socket.mojom',
- 'interfaces/network/url_loader.mojom',
- 'interfaces/network/web_socket.mojom',
+ '../network/public/interfaces/cookie_store.mojom',
+ '../network/public/interfaces/net_address.mojom',
+ '../network/public/interfaces/network_error.mojom',
+ '../network/public/interfaces/network_service.mojom',
+ '../network/public/interfaces/tcp_bound_socket.mojom',
+ '../network/public/interfaces/tcp_connected_socket.mojom',
+ '../network/public/interfaces/tcp_server_socket.mojom',
+ '../network/public/interfaces/udp_socket.mojom',
+ '../network/public/interfaces/url_loader.mojom',
+ '../network/public/interfaces/web_socket.mojom',
],
'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
diff --git a/mojo/tools/package_manager/BUILD.gn b/mojo/tools/package_manager/BUILD.gn
index 5e90ce9..e8be3ae 100644
--- a/mojo/tools/package_manager/BUILD.gn
+++ b/mojo/tools/package_manager/BUILD.gn
@@ -25,7 +25,7 @@
"//mojo/common",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
"//third_party/zlib:zip",
"//url",
]
diff --git a/mojo/tools/package_manager/package_fetcher.cc b/mojo/tools/package_manager/package_fetcher.cc
index dee24c0..a2ad522 100644
--- a/mojo/tools/package_manager/package_fetcher.cc
+++ b/mojo/tools/package_manager/package_fetcher.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
namespace mojo {
diff --git a/mojo/tools/package_manager/package_fetcher.h b/mojo/tools/package_manager/package_fetcher.h
index 3cbd7a7..ac7580a 100644
--- a/mojo/tools/package_manager/package_fetcher.h
+++ b/mojo/tools/package_manager/package_fetcher.h
@@ -9,8 +9,8 @@
#include "base/files/file_path.h"
#include "mojo/common/handle_watcher.h"
#include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "url/gurl.h"
namespace base {
diff --git a/mojo/tools/package_manager/package_manager_application.h b/mojo/tools/package_manager/package_manager_application.h
index 87d4fcd..af23710 100644
--- a/mojo/tools/package_manager/package_manager_application.h
+++ b/mojo/tools/package_manager/package_manager_application.h
@@ -11,7 +11,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "mojo/tools/package_manager/package_fetcher.h"
namespace mojo {
diff --git a/mojo/tools/roll/rev_sdk.py b/mojo/tools/roll/rev_sdk.py
index 1fe7095..2480711 100755
--- a/mojo/tools/roll/rev_sdk.py
+++ b/mojo/tools/roll/rev_sdk.py
@@ -13,6 +13,7 @@
"mojo/edk",
"mojo/public",
"mojo/services/public",
+ "mojo/services/network/public",
"mojo/services/surfaces/public",
"mojo/services/view_manager/public",
"mojo/services/window_manager/public",
diff --git a/services/http_server/BUILD.gn b/services/http_server/BUILD.gn
index ce330a5..81a637f 100644
--- a/services/http_server/BUILD.gn
+++ b/services/http_server/BUILD.gn
@@ -19,7 +19,7 @@
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
"//services/http_server/public",
"//services/http_server/public:util",
"//third_party/re2",
diff --git a/services/http_server/http_server.cc b/services/http_server/http_server.cc
index ac7953a..1f31ba9 100644
--- a/services/http_server/http_server.cc
+++ b/services/http_server/http_server.cc
@@ -22,7 +22,7 @@
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/environment/async_waiter.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "services/http_server/http_request_parser.h"
#include "services/http_server/public/http_request.mojom.h"
#include "services/http_server/public/http_response.mojom.h"
diff --git a/services/js/BUILD.gn b/services/js/BUILD.gn
index 59009c3..5dc9872 100644
--- a/services/js/BUILD.gn
+++ b/services/js/BUILD.gn
@@ -36,8 +36,8 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
+ "//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/content_handler",
- "//mojo/services/public/interfaces/network",
"//services/js/modules/clock",
"//services/js/modules/gl",
]
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index acf9e4b..580e775 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -162,7 +162,7 @@
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
"//shell/domain_socket",
"//mojo/spy",
"//services/tracing:bindings",
diff --git a/shell/dynamic_application_loader.cc b/shell/dynamic_application_loader.cc
index e8a4fb2..47bd64a 100644
--- a/shell/dynamic_application_loader.cc
+++ b/shell/dynamic_application_loader.cc
@@ -19,7 +19,7 @@
#include "mojo/common/common_type_converters.h"
#include "mojo/common/data_pipe_utils.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "shell/context.h"
#include "shell/data_pipe_peek.h"
#include "shell/filename_util.h"
diff --git a/shell/dynamic_application_loader.h b/shell/dynamic_application_loader.h
index 1dc9a8a..e0c553a 100644
--- a/shell/dynamic_application_loader.h
+++ b/shell/dynamic_application_loader.h
@@ -13,7 +13,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/application_manager/application_loader.h"
#include "mojo/public/cpp/system/core.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "shell/dynamic_service_runner.h"
#include "url/gurl.h"
diff --git a/sky/engine/platform/BUILD.gn b/sky/engine/platform/BUILD.gn
index 8b1f5e1..b11c2d5 100644
--- a/sky/engine/platform/BUILD.gn
+++ b/sky/engine/platform/BUILD.gn
@@ -648,7 +648,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/network",
+ "//mojo/services/network/public/interfaces",
"//skia",
"//sky/engine/wtf",
"//third_party/harfbuzz-ng",
diff --git a/sky/engine/platform/fetcher/MojoFetcher.cpp b/sky/engine/platform/fetcher/MojoFetcher.cpp
index 140c83b..cce46d0 100644
--- a/sky/engine/platform/fetcher/MojoFetcher.cpp
+++ b/sky/engine/platform/fetcher/MojoFetcher.cpp
@@ -6,7 +6,7 @@
#include "sky/engine/platform/fetcher/MojoFetcher.h"
#include "base/bind.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "sky/engine/platform/weborigin/KURL.h"
#include "sky/engine/public/platform/Platform.h"
diff --git a/sky/engine/platform/fetcher/MojoFetcher.h b/sky/engine/platform/fetcher/MojoFetcher.h
index 24d0031..d919cd9 100644
--- a/sky/engine/platform/fetcher/MojoFetcher.h
+++ b/sky/engine/platform/fetcher/MojoFetcher.h
@@ -6,7 +6,7 @@
#define SKY_ENGINE_PLATFORM_FETCHER_MOJOFETCHER_H_
#include "base/memory/weak_ptr.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
namespace blink {
class KURL;
diff --git a/sky/framework/xmlhttprequest.sky b/sky/framework/xmlhttprequest.sky
index 75a7a47..fc688d4 100644
--- a/sky/framework/xmlhttprequest.sky
+++ b/sky/framework/xmlhttprequest.sky
@@ -1,7 +1,7 @@
<import src="/mojo/public/sky/core.sky" as="core" />
<import src="/mojo/public/sky/unicode.sky" as="unicode" />
-<import src="/mojo/services/public/interfaces/network/network_service.mojom.sky" as="net" />
-<import src="/mojo/services/public/interfaces/network/url_loader.mojom.sky" as="loader" />
+<import src="/mojo/services/network/public/interfaces/network_service.mojom.sky" as="net" />
+<import src="/mojo/services/network/public/interfaces/url_loader.mojom.sky" as="loader" />
<import src="shell.sky" as="shell" />
<script>
// XHR keeps itself alive.
diff --git a/sky/tests/services/network.sky b/sky/tests/services/network.sky
index 6b101b5..e548201 100644
--- a/sky/tests/services/network.sky
+++ b/sky/tests/services/network.sky
@@ -3,8 +3,8 @@
<import src="../resources/mocha.sky" />
<import src="/mojo/public/sky/core.sky" as="core" />
<import src="/mojo/public/sky/connection.sky" as="connection" />
-<import src="/mojo/services/public/interfaces/network/network_service.mojom.sky" as="net" />
-<import src="/mojo/services/public/interfaces/network/url_loader.mojom.sky" as="loader" />
+<import src="/mojo/services/network/public/interfaces/network_service.mojom.sky" as="net" />
+<import src="/mojo/services/network/public/interfaces/url_loader.mojom.sky" as="loader" />
<script>
describe('Mojo network_service', function() {
this.enableTimeouts(false);
diff --git a/sky/viewer/BUILD.gn b/sky/viewer/BUILD.gn
index c4b40f5..913cff4 100644
--- a/sky/viewer/BUILD.gn
+++ b/sky/viewer/BUILD.gn
@@ -49,11 +49,11 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
+ "//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/content_handler",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/navigation",
- "//mojo/services/public/interfaces/network",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//net",
diff --git a/sky/viewer/content_handler_impl.cc b/sky/viewer/content_handler_impl.cc
index 69768da..e4ceaec 100644
--- a/sky/viewer/content_handler_impl.cc
+++ b/sky/viewer/content_handler_impl.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "mojo/public/cpp/application/connect.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "sky/viewer/document_view.h"
namespace sky {
diff --git a/sky/viewer/converters/url_request_types.h b/sky/viewer/converters/url_request_types.h
index f75a882..dd6b0b7 100644
--- a/sky/viewer/converters/url_request_types.h
+++ b/sky/viewer/converters/url_request_types.h
@@ -5,7 +5,7 @@
#ifndef SKY_VIEWER_CONVERTERS_URL_REQUEST_TYPES_H_
#define SKY_VIEWER_CONVERTERS_URL_REQUEST_TYPES_H_
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
namespace blink {
class WebURLRequest;
diff --git a/sky/viewer/document_view.h b/sky/viewer/document_view.h
index 5a9c7d6..ed5410d 100644
--- a/sky/viewer/document_view.h
+++ b/sky/viewer/document_view.h
@@ -11,9 +11,9 @@
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
#include "mojo/public/interfaces/application/application.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
#include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
#include "mojo/services/view_manager/public/cpp/view_observer.h"
diff --git a/sky/viewer/platform/platform_impl.h b/sky/viewer/platform/platform_impl.h
index 32c58c3..c214d6a 100644
--- a/sky/viewer/platform/platform_impl.h
+++ b/sky/viewer/platform/platform_impl.h
@@ -9,7 +9,7 @@
#include "base/message_loop/message_loop.h"
#include "base/threading/thread_local_storage.h"
#include "base/timer/timer.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "sky/engine/public/platform/Platform.h"
namespace mojo {
diff --git a/sky/viewer/platform/weburlloader_impl.cc b/sky/viewer/platform/weburlloader_impl.cc
index 2b68a3e..7dd9b0c 100644
--- a/sky/viewer/platform/weburlloader_impl.cc
+++ b/sky/viewer/platform/weburlloader_impl.cc
@@ -9,7 +9,7 @@
#include "base/strings/string_util.h"
#include "base/thread_task_runner_handle.h"
#include "mojo/common/common_type_converters.h"
-#include "mojo/services/public/interfaces/network/network_service.mojom.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "net/base/net_errors.h"
#include "sky/engine/public/platform/WebURLError.h"
#include "sky/engine/public/platform/WebURLLoadTiming.h"
diff --git a/sky/viewer/platform/weburlloader_impl.h b/sky/viewer/platform/weburlloader_impl.h
index 42b6514..a8573cd 100644
--- a/sky/viewer/platform/weburlloader_impl.h
+++ b/sky/viewer/platform/weburlloader_impl.h
@@ -7,7 +7,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/common/handle_watcher.h"
-#include "mojo/services/public/interfaces/network/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "sky/engine/public/platform/WebURLLoader.h"
#include "sky/engine/public/platform/WebURLRequest.h"
