Move //mojo/services/network/public/interfaces to //mojo/services/network/interfaces.
And also //mojo/services/network/public/cpp/*.{cc,h} to
//mojo/services/network (the code isn't used anywhere else -- not even
in a bastardized copy -- and has bad dependencies, e.g., on //base).
Note that the mojom files aren't actually in a state to be consumed
externally (easily), since they hard-code a "third_party" directory in
various imports.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1396423002 .
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
index 9976f8c..e4fc4d0 100644
--- a/mojo/services/network/BUILD.gn
+++ b/mojo/services/network/BUILD.gn
@@ -60,16 +60,23 @@
"tcp_server_socket_impl.h",
"udp_socket_impl.cc",
"udp_socket_impl.h",
+ "udp_socket_wrapper.cc",
+ "udp_socket_wrapper.h",
"url_loader_impl.cc",
"url_loader_impl.h",
"web_socket_impl.cc",
"web_socket_impl.h",
+ "web_socket_read_queue.cc",
+ "web_socket_read_queue.h",
+ "web_socket_write_queue.cc",
+ "web_socket_write_queue.h",
]
deps = [
"//base",
- "//mojo/services/network/public/cpp",
- "//mojo/services/network/public/interfaces",
+ "//mojo/common",
+ "//mojo/environment:chromium",
+ "//mojo/services/network/interfaces",
"//net",
"//net:http_server",
"//third_party/mojo/src/mojo/public/cpp/application",
@@ -88,8 +95,7 @@
":lib",
"//base",
"//mojo/application",
- "//mojo/services/network/public/cpp",
- "//mojo/services/network/public/interfaces",
+ "//mojo/services/network/interfaces",
"//third_party/mojo/src/mojo/public/c/system:for_shared_library",
"//third_party/mojo/src/mojo/public/cpp/application",
"//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
@@ -113,8 +119,7 @@
"//base",
"//mojo/application",
"//mojo/application:test_support",
- "//mojo/services/network/public/cpp",
- "//mojo/services/network/public/interfaces",
+ "//mojo/services/network/interfaces",
"//net",
"//net:test_support",
"//testing/gtest",
diff --git a/mojo/services/network/cookie_store_impl.h b/mojo/services/network/cookie_store_impl.h
index 9a9f65f..6e4e1b2 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/network/public/interfaces/cookie_store.mojom.h"
+#include "mojo/services/network/interfaces/cookie_store.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
#include "url/gurl.h"
diff --git a/mojo/services/network/host_resolver_apptest.cc b/mojo/services/network/host_resolver_apptest.cc
index 7ff7b0b..16a171c 100644
--- a/mojo/services/network/host_resolver_apptest.cc
+++ b/mojo/services/network/host_resolver_apptest.cc
@@ -8,9 +8,9 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "mojo/common/message_pump_mojo.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "mojo/services/network/public/interfaces/net_address.mojom.h"
-#include "mojo/services/network/public/interfaces/host_resolver.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/net_address.mojom.h"
+#include "mojo/services/network/interfaces/host_resolver.mojom.h"
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
diff --git a/mojo/services/network/host_resolver_impl.h b/mojo/services/network/host_resolver_impl.h
index 08a9690..638f53d 100644
--- a/mojo/services/network/host_resolver_impl.h
+++ b/mojo/services/network/host_resolver_impl.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
-#include "mojo/services/network/public/interfaces/host_resolver.mojom.h"
+#include "mojo/services/network/interfaces/host_resolver.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
namespace net {
diff --git a/mojo/services/network/http_connection_impl.cc b/mojo/services/network/http_connection_impl.cc
index 6203c23..e42fd1e 100644
--- a/mojo/services/network/http_connection_impl.cc
+++ b/mojo/services/network/http_connection_impl.cc
@@ -13,10 +13,10 @@
#include "base/strings/string_util.h"
#include "mojo/common/handle_watcher.h"
#include "mojo/services/network/http_server_impl.h"
+#include "mojo/services/network/interfaces/web_socket.mojom.h"
#include "mojo/services/network/net_adapters.h"
-#include "mojo/services/network/public/cpp/web_socket_read_queue.h"
-#include "mojo/services/network/public/cpp/web_socket_write_queue.h"
-#include "mojo/services/network/public/interfaces/web_socket.mojom.h"
+#include "mojo/services/network/web_socket_read_queue.h"
+#include "mojo/services/network/web_socket_write_queue.h"
#include "net/base/net_errors.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_status_code.h"
diff --git a/mojo/services/network/http_connection_impl.h b/mojo/services/network/http_connection_impl.h
index 526a688..cb3a991 100644
--- a/mojo/services/network/http_connection_impl.h
+++ b/mojo/services/network/http_connection_impl.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/network/public/interfaces/http_connection.mojom.h"
-#include "mojo/services/network/public/interfaces/http_message.mojom.h"
+#include "mojo/services/network/interfaces/http_connection.mojom.h"
+#include "mojo/services/network/interfaces/http_message.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
namespace net {
diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
index e493f89..c9f3a13 100644
--- a/mojo/services/network/http_server_apptest.cc
+++ b/mojo/services/network/http_server_apptest.cc
@@ -11,15 +11,15 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "mojo/common/data_pipe_utils.h"
+#include "mojo/services/network/interfaces/http_connection.mojom.h"
+#include "mojo/services/network/interfaces/http_message.mojom.h"
+#include "mojo/services/network/interfaces/http_server.mojom.h"
+#include "mojo/services/network/interfaces/net_address.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/web_socket.mojom.h"
#include "mojo/services/network/net_address_type_converters.h"
-#include "mojo/services/network/public/cpp/web_socket_read_queue.h"
-#include "mojo/services/network/public/cpp/web_socket_write_queue.h"
-#include "mojo/services/network/public/interfaces/http_connection.mojom.h"
-#include "mojo/services/network/public/interfaces/http_message.mojom.h"
-#include "mojo/services/network/public/interfaces/http_server.mojom.h"
-#include "mojo/services/network/public/interfaces/net_address.mojom.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "mojo/services/network/public/interfaces/web_socket.mojom.h"
+#include "mojo/services/network/web_socket_read_queue.h"
+#include "mojo/services/network/web_socket_write_queue.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
diff --git a/mojo/services/network/http_server_impl.h b/mojo/services/network/http_server_impl.h
index 67192da..b2f6f9d 100644
--- a/mojo/services/network/http_server_impl.h
+++ b/mojo/services/network/http_server_impl.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/network/public/interfaces/http_server.mojom.h"
-#include "mojo/services/network/public/interfaces/net_address.mojom.h"
+#include "mojo/services/network/interfaces/http_server.mojom.h"
+#include "mojo/services/network/interfaces/net_address.mojom.h"
#include "net/server/http_server.h"
namespace net {
diff --git a/mojo/services/network/public/interfaces/BUILD.gn b/mojo/services/network/interfaces/BUILD.gn
similarity index 92%
rename from mojo/services/network/public/interfaces/BUILD.gn
rename to mojo/services/network/interfaces/BUILD.gn
index c8c56cf..32634cd 100644
--- a/mojo/services/network/public/interfaces/BUILD.gn
+++ b/mojo/services/network/interfaces/BUILD.gn
@@ -27,5 +27,5 @@
"//third_party/mojo/src/mojo/public/interfaces/network",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
}
diff --git a/mojo/services/network/public/interfaces/cookie_store.mojom b/mojo/services/network/interfaces/cookie_store.mojom
similarity index 100%
rename from mojo/services/network/public/interfaces/cookie_store.mojom
rename to mojo/services/network/interfaces/cookie_store.mojom
diff --git a/mojo/services/network/public/interfaces/host_resolver.mojom b/mojo/services/network/interfaces/host_resolver.mojom
similarity index 89%
rename from mojo/services/network/public/interfaces/host_resolver.mojom
rename to mojo/services/network/interfaces/host_resolver.mojom
index eed3740..2643fef 100644
--- a/mojo/services/network/public/interfaces/host_resolver.mojom
+++ b/mojo/services/network/interfaces/host_resolver.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "network/public/interfaces/net_address.mojom";
+import "network/interfaces/net_address.mojom";
import "third_party/mojo/src/mojo/public/interfaces/network/network_error.mojom";
interface HostResolver {
diff --git a/mojo/services/network/public/interfaces/http_connection.mojom b/mojo/services/network/interfaces/http_connection.mojom
similarity index 93%
rename from mojo/services/network/public/interfaces/http_connection.mojom
rename to mojo/services/network/interfaces/http_connection.mojom
index 1f2c0ae..119513e 100644
--- a/mojo/services/network/public/interfaces/http_connection.mojom
+++ b/mojo/services/network/interfaces/http_connection.mojom
@@ -4,8 +4,8 @@
module mojo;
-import "network/public/interfaces/http_message.mojom";
-import "network/public/interfaces/web_socket.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 {
diff --git a/mojo/services/network/public/interfaces/http_message.mojom b/mojo/services/network/interfaces/http_message.mojom
similarity index 100%
rename from mojo/services/network/public/interfaces/http_message.mojom
rename to mojo/services/network/interfaces/http_message.mojom
diff --git a/mojo/services/network/public/interfaces/http_server.mojom b/mojo/services/network/interfaces/http_server.mojom
similarity index 85%
rename from mojo/services/network/public/interfaces/http_server.mojom
rename to mojo/services/network/interfaces/http_server.mojom
index dde9c45..789f482 100644
--- a/mojo/services/network/public/interfaces/http_server.mojom
+++ b/mojo/services/network/interfaces/http_server.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "network/public/interfaces/http_connection.mojom";
+import "network/interfaces/http_connection.mojom";
interface HttpServerDelegate {
// Called when a connection is established.
diff --git a/mojo/services/network/public/interfaces/net_address.mojom b/mojo/services/network/interfaces/net_address.mojom
similarity index 100%
rename from mojo/services/network/public/interfaces/net_address.mojom
rename to mojo/services/network/interfaces/net_address.mojom
diff --git a/mojo/services/network/public/interfaces/network_service.mojom b/mojo/services/network/interfaces/network_service.mojom
similarity index 85%
rename from mojo/services/network/public/interfaces/network_service.mojom
rename to mojo/services/network/interfaces/network_service.mojom
index 508587e..5737ca9 100644
--- a/mojo/services/network/public/interfaces/network_service.mojom
+++ b/mojo/services/network/interfaces/network_service.mojom
@@ -4,16 +4,16 @@
module mojo;
-import "network/public/interfaces/cookie_store.mojom";
-import "network/public/interfaces/host_resolver.mojom";
-import "network/public/interfaces/http_server.mojom";
-import "network/public/interfaces/net_address.mojom";
-import "network/public/interfaces/tcp_bound_socket.mojom";
-import "network/public/interfaces/tcp_connected_socket.mojom";
-import "network/public/interfaces/udp_socket.mojom";
-import "network/public/interfaces/url_loader.mojom";
-import "network/public/interfaces/url_loader_interceptor.mojom";
-import "network/public/interfaces/web_socket.mojom";
+import "network/interfaces/cookie_store.mojom";
+import "network/interfaces/host_resolver.mojom";
+import "network/interfaces/http_server.mojom";
+import "network/interfaces/net_address.mojom";
+import "network/interfaces/tcp_bound_socket.mojom";
+import "network/interfaces/tcp_connected_socket.mojom";
+import "network/interfaces/udp_socket.mojom";
+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
diff --git a/mojo/services/network/public/interfaces/tcp_bound_socket.mojom b/mojo/services/network/interfaces/tcp_bound_socket.mojom
similarity index 89%
rename from mojo/services/network/public/interfaces/tcp_bound_socket.mojom
rename to mojo/services/network/interfaces/tcp_bound_socket.mojom
index 10ef84e..bd2568a 100644
--- a/mojo/services/network/public/interfaces/tcp_bound_socket.mojom
+++ b/mojo/services/network/interfaces/tcp_bound_socket.mojom
@@ -4,9 +4,9 @@
module mojo;
-import "network/public/interfaces/net_address.mojom";
-import "network/public/interfaces/tcp_connected_socket.mojom";
-import "network/public/interfaces/tcp_server_socket.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
diff --git a/mojo/services/network/public/interfaces/tcp_connected_socket.mojom b/mojo/services/network/interfaces/tcp_connected_socket.mojom
similarity index 100%
rename from mojo/services/network/public/interfaces/tcp_connected_socket.mojom
rename to mojo/services/network/interfaces/tcp_connected_socket.mojom
diff --git a/mojo/services/network/public/interfaces/tcp_server_socket.mojom b/mojo/services/network/interfaces/tcp_server_socket.mojom
similarity index 89%
rename from mojo/services/network/public/interfaces/tcp_server_socket.mojom
rename to mojo/services/network/interfaces/tcp_server_socket.mojom
index 90309cf..fa9082d 100644
--- a/mojo/services/network/public/interfaces/tcp_server_socket.mojom
+++ b/mojo/services/network/interfaces/tcp_server_socket.mojom
@@ -4,8 +4,8 @@
module mojo;
-import "network/public/interfaces/net_address.mojom";
-import "network/public/interfaces/tcp_connected_socket.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.
diff --git a/mojo/services/network/public/interfaces/udp_socket.mojom b/mojo/services/network/interfaces/udp_socket.mojom
similarity index 98%
rename from mojo/services/network/public/interfaces/udp_socket.mojom
rename to mojo/services/network/interfaces/udp_socket.mojom
index 34a3821..78d4b1b 100644
--- a/mojo/services/network/public/interfaces/udp_socket.mojom
+++ b/mojo/services/network/interfaces/udp_socket.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "network/public/interfaces/net_address.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
diff --git a/mojo/services/network/public/interfaces/url_loader.mojom b/mojo/services/network/interfaces/url_loader.mojom
similarity index 96%
rename from mojo/services/network/public/interfaces/url_loader.mojom
rename to mojo/services/network/interfaces/url_loader.mojom
index 2b7da62..65528a3 100644
--- a/mojo/services/network/public/interfaces/url_loader.mojom
+++ b/mojo/services/network/interfaces/url_loader.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "network/public/interfaces/http_message.mojom";
+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";
diff --git a/mojo/services/network/public/interfaces/url_loader_interceptor.mojom b/mojo/services/network/interfaces/url_loader_interceptor.mojom
similarity index 100%
rename from mojo/services/network/public/interfaces/url_loader_interceptor.mojom
rename to mojo/services/network/interfaces/url_loader_interceptor.mojom
diff --git a/mojo/services/network/public/interfaces/web_socket.mojom b/mojo/services/network/interfaces/web_socket.mojom
similarity index 100%
rename from mojo/services/network/public/interfaces/web_socket.mojom
rename to mojo/services/network/interfaces/web_socket.mojom
diff --git a/mojo/services/network/net_address_type_converters.h b/mojo/services/network/net_address_type_converters.h
index a1af10e..5750cc9 100644
--- a/mojo/services/network/net_address_type_converters.h
+++ b/mojo/services/network/net_address_type_converters.h
@@ -5,7 +5,7 @@
#ifndef MOJO_SERVICES_NETWORK_NET_ADDRESS_TYPE_CONVERTERS_H_
#define MOJO_SERVICES_NETWORK_NET_ADDRESS_TYPE_CONVERTERS_H_
-#include "mojo/services/network/public/interfaces/net_address.mojom.h"
+#include "mojo/services/network/interfaces/net_address.mojom.h"
#include "net/base/ip_endpoint.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"
diff --git a/mojo/services/network/network_service_impl.h b/mojo/services/network/network_service_impl.h
index 360d9f0..995bc91 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/common/weak_interface_ptr_set.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
#include "url/gurl.h"
diff --git a/mojo/services/network/public/DEPS b/mojo/services/network/public/DEPS
deleted file mode 100644
index 86a3623..0000000
--- a/mojo/services/network/public/DEPS
+++ /dev/null
@@ -1,10 +0,0 @@
-include_rules = [
- "-build",
- "-mojo",
- "-net",
- "-services",
- "-testing",
- "!mojo/common",
- "+mojo/services/network/public",
- "+third_party/mojo/src/mojo/public",
-]
diff --git a/mojo/services/network/public/cpp/BUILD.gn b/mojo/services/network/public/cpp/BUILD.gn
deleted file mode 100644
index 09dced9..0000000
--- a/mojo/services/network/public/cpp/BUILD.gn
+++ /dev/null
@@ -1,32 +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.
-
-import("//build/module_args/mojo.gni")
-import("//third_party/mojo/src/mojo/public/mojo_sdk.gni")
-
-mojo_sdk_source_set("cpp") {
- restrict_external_deps = false
- public_configs = [ "../../../public/build/config:mojo_services" ]
- sources = [
- "udp_socket_wrapper.cc",
- "udp_socket_wrapper.h",
- "web_socket_read_queue.cc",
- "web_socket_read_queue.h",
- "web_socket_write_queue.cc",
- "web_socket_write_queue.h",
- ]
-
- deps = [
- "../interfaces",
- "//base",
- "//third_party/mojo/src/mojo/public/cpp/application",
- "//mojo/common",
- "//mojo/environment:chromium",
- ]
-
- mojo_sdk_deps = [
- "mojo/public/c/system",
- "mojo/public/cpp/system",
- ]
-}
diff --git a/mojo/services/network/public/cpp/DEPS b/mojo/services/network/public/cpp/DEPS
deleted file mode 100644
index dfe3bd8..0000000
--- a/mojo/services/network/public/cpp/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
- "+network/public",
-]
diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/network/tcp_bound_socket_impl.h
index 4685409..993c2fb 100644
--- a/mojo/services/network/tcp_bound_socket_impl.h
+++ b/mojo/services/network/tcp_bound_socket_impl.h
@@ -6,7 +6,7 @@
#define MOJO_SERVICES_NETWORK_TCP_BOUND_SOCKET_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/network/public/interfaces/tcp_bound_socket.mojom.h"
+#include "mojo/services/network/interfaces/tcp_bound_socket.mojom.h"
#include "net/socket/tcp_socket.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h
index 6b6460e..05f6828 100644
--- a/mojo/services/network/tcp_connected_socket_impl.h
+++ b/mojo/services/network/tcp_connected_socket_impl.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/common/handle_watcher.h"
-#include "mojo/services/network/public/interfaces/tcp_connected_socket.mojom.h"
+#include "mojo/services/network/interfaces/tcp_connected_socket.mojom.h"
#include "net/socket/tcp_socket.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/network/tcp_server_socket_impl.h
index 324697c..a7435d2 100644
--- a/mojo/services/network/tcp_server_socket_impl.h
+++ b/mojo/services/network/tcp_server_socket_impl.h
@@ -6,7 +6,7 @@
#define MOJO_SERVICES_NETWORK_TCP_SERVER_SOCKET_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/network/public/interfaces/tcp_server_socket.mojom.h"
+#include "mojo/services/network/interfaces/tcp_server_socket.mojom.h"
#include "net/base/ip_endpoint.h"
#include "net/socket/tcp_socket.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc
index 2b602f4..e59e851 100644
--- a/mojo/services/network/udp_socket_apptest.cc
+++ b/mojo/services/network/udp_socket_apptest.cc
@@ -5,9 +5,9 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/run_loop.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 "mojo/services/network/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/udp_socket.mojom.h"
+#include "mojo/services/network/udp_socket_wrapper.h"
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp_socket_impl.h
index 0af406e..b837dac 100644
--- a/mojo/services/network/udp_socket_impl.h
+++ b/mojo/services/network/udp_socket_impl.h
@@ -9,7 +9,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
+#include "mojo/services/network/interfaces/udp_socket.mojom.h"
#include "net/base/ip_endpoint.h"
#include "net/udp/udp_socket.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
diff --git a/mojo/services/network/public/cpp/udp_socket_wrapper.cc b/mojo/services/network/udp_socket_wrapper.cc
similarity index 94%
rename from mojo/services/network/public/cpp/udp_socket_wrapper.cc
rename to mojo/services/network/udp_socket_wrapper.cc
index 10a1f13..8dde49d 100644
--- a/mojo/services/network/public/cpp/udp_socket_wrapper.cc
+++ b/mojo/services/network/udp_socket_wrapper.cc
@@ -2,11 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "network/public/cpp/udp_socket_wrapper.h"
+#include "mojo/services/network/udp_socket_wrapper.h"
-#include <assert.h>
-
-#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h"
+#include "base/logging.h"
namespace mojo {
namespace {
@@ -152,7 +150,7 @@
return;
}
- MOJO_DCHECK(send_requests_.empty());
+ DCHECK(send_requests_.empty());
current_pending_sends_++;
socket_->SendTo(dest_addr.Pass(), data.Pass(),
ErrorCallback(static_cast<ErrorCallback::Runnable*>(
@@ -164,7 +162,7 @@
Array<uint8_t> data) {
if (!receive_requests_.empty()) {
// The cache should be empty if there are user requests waiting for data.
- MOJO_DCHECK(receive_queue_.empty());
+ DCHECK(receive_queue_.empty());
socket_->ReceiveMore(1);
@@ -175,7 +173,7 @@
return;
}
- MOJO_DCHECK(receive_queue_.size() < max_receive_queue_size_);
+ DCHECK_LT(receive_queue_.size(), max_receive_queue_size_);
ReceivedData* received_data = new ReceivedData();
received_data->result = result.Pass();
received_data->src_addr = src_addr.Pass();
@@ -193,10 +191,10 @@
void UDPSocketWrapper::OnNegotiateMaxPendingSendRequestsCompleted(
uint32_t actual_size) {
- MOJO_DCHECK(max_pending_sends_ == 1);
+ DCHECK_EQ(max_pending_sends_, 1u);
if (actual_size == 0) {
- assert(false);
+ NOTREACHED();
return;
}
diff --git a/mojo/services/network/public/cpp/udp_socket_wrapper.h b/mojo/services/network/udp_socket_wrapper.h
similarity index 95%
rename from mojo/services/network/public/cpp/udp_socket_wrapper.h
rename to mojo/services/network/udp_socket_wrapper.h
index c45ed47..7c0722e 100644
--- a/mojo/services/network/public/cpp/udp_socket_wrapper.h
+++ b/mojo/services/network/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_NETWORK_PUBLIC_CPP_UDP_SOCKET_WRAPPER_H_
-#define MOJO_SERVICES_NETWORK_PUBLIC_CPP_UDP_SOCKET_WRAPPER_H_
+#ifndef MOJO_SERVICES_NETWORK_UDP_SOCKET_WRAPPER_H_
+#define MOJO_SERVICES_NETWORK_UDP_SOCKET_WRAPPER_H_
#include <queue>
-#include "network/public/interfaces/udp_socket.mojom.h"
+#include "mojo/services/network/interfaces/udp_socket.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
namespace mojo {
@@ -179,4 +179,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_NETWORK_PUBLIC_CPP_UDP_SOCKET_WRAPPER_H_
+#endif // MOJO_SERVICES_NETWORK_UDP_SOCKET_WRAPPER_H_
diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h
index f25974c..95bc69b 100644
--- a/mojo/services/network/url_loader_impl.h
+++ b/mojo/services/network/url_loader_impl.h
@@ -8,8 +8,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/common/handle_watcher.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/url_loader.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
#include "net/base/net_errors.h"
#include "net/url_request/url_request.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
diff --git a/mojo/services/network/url_loader_interceptor_apptest.cc b/mojo/services/network/url_loader_interceptor_apptest.cc
index b67c7ec..aaca1fa 100644
--- a/mojo/services/network/url_loader_interceptor_apptest.cc
+++ b/mojo/services/network/url_loader_interceptor_apptest.cc
@@ -9,7 +9,7 @@
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/network/public/interfaces/network_service.mojom.h"
+#include "mojo/services/network/interfaces/network_service.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc
index 7dd9b23..6cbadc5 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/network/public/cpp/web_socket_read_queue.h"
-#include "mojo/services/network/public/cpp/web_socket_write_queue.h"
+#include "mojo/services/network/web_socket_read_queue.h"
+#include "mojo/services/network/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 f84f840..8f3a5ed 100644
--- a/mojo/services/network/web_socket_impl.h
+++ b/mojo/services/network/web_socket_impl.h
@@ -6,7 +6,7 @@
#define MOJO_SERVICES_NETWORK_WEB_SOCKET_IMPL_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/network/public/interfaces/web_socket.mojom.h"
+#include "mojo/services/network/interfaces/web_socket.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
namespace net {
diff --git a/mojo/services/network/public/cpp/web_socket_read_queue.cc b/mojo/services/network/web_socket_read_queue.cc
similarity index 97%
rename from mojo/services/network/public/cpp/web_socket_read_queue.cc
rename to mojo/services/network/web_socket_read_queue.cc
index d3e950b..6b47c89 100644
--- a/mojo/services/network/public/cpp/web_socket_read_queue.cc
+++ b/mojo/services/network/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 "network/public/cpp/web_socket_read_queue.h"
+#include "mojo/services/network/web_socket_read_queue.h"
#include <memory>
diff --git a/mojo/services/network/public/cpp/web_socket_read_queue.h b/mojo/services/network/web_socket_read_queue.h
similarity index 85%
rename from mojo/services/network/public/cpp/web_socket_read_queue.h
rename to mojo/services/network/web_socket_read_queue.h
index 287e91c..04e4411 100644
--- a/mojo/services/network/public/cpp/web_socket_read_queue.h
+++ b/mojo/services/network/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_NETWORK_PUBLIC_CPP_WEB_SOCKET_READ_QUEUE_H_
-#define MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_READ_QUEUE_H_
+#ifndef MOJO_SERVICES_NETWORK_WEB_SOCKET_READ_QUEUE_H_
+#define MOJO_SERVICES_NETWORK_WEB_SOCKET_READ_QUEUE_H_
#include "base/callback.h"
#include "base/memory/scoped_vector.h"
@@ -41,4 +41,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_READ_QUEUE_H_
+#endif // MOJO_SERVICES_NETWORK_WEB_SOCKET_READ_QUEUE_H_
diff --git a/mojo/services/network/public/cpp/web_socket_write_queue.cc b/mojo/services/network/web_socket_write_queue.cc
similarity index 97%
rename from mojo/services/network/public/cpp/web_socket_write_queue.cc
rename to mojo/services/network/web_socket_write_queue.cc
index 9a0079c..d0c2ae8 100644
--- a/mojo/services/network/public/cpp/web_socket_write_queue.cc
+++ b/mojo/services/network/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 "network/public/cpp/web_socket_write_queue.h"
+#include "mojo/services/network/web_socket_write_queue.h"
#include "base/bind.h"
#include "base/logging.h"
diff --git a/mojo/services/network/public/cpp/web_socket_write_queue.h b/mojo/services/network/web_socket_write_queue.h
similarity index 86%
rename from mojo/services/network/public/cpp/web_socket_write_queue.h
rename to mojo/services/network/web_socket_write_queue.h
index 91e7924..ed8f66e 100644
--- a/mojo/services/network/public/cpp/web_socket_write_queue.h
+++ b/mojo/services/network/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_NETWORK_PUBLIC_CPP_WEB_SOCKET_WRITE_QUEUE_H_
-#define MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_WRITE_QUEUE_H_
+#ifndef MOJO_SERVICES_NETWORK_WEB_SOCKET_WRITE_QUEUE_H_
+#define MOJO_SERVICES_NETWORK_WEB_SOCKET_WRITE_QUEUE_H_
#include "base/callback.h"
#include "base/memory/scoped_vector.h"
@@ -43,4 +43,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_NETWORK_PUBLIC_CPP_WEB_SOCKET_WRITE_QUEUE_H_
+#endif // MOJO_SERVICES_NETWORK_WEB_SOCKET_WRITE_QUEUE_H_
