Commit 26cf4748 authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

services/proxy_resolver/public/{interfaces => mojom}

and struct_traits => mojom_traits

TBR=dcheng@chromium.org
TBR=jam@chromium.org

Bug: 806965
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: Ia252dcac3d6e0c00ab143871e66b7eec13a66e81
Reviewed-on: https://chromium-review.googlesource.com/912778
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535995}
parent f7f533e8
......@@ -1799,7 +1799,7 @@ split_static_library("browser") {
"//services/preferences/public/cpp/tracked",
"//services/preferences/public/mojom",
"//services/preferences/tracked",
"//services/proxy_resolver/public/interfaces",
"//services/proxy_resolver/public/mojom",
"//services/resource_coordinator/public/cpp:resource_coordinator_cpp",
"//services/service_manager/public/cpp",
"//services/shape_detection/public/interfaces",
......
......@@ -65,7 +65,7 @@ include_rules = [
"+services/preferences/public/mojom",
"+services/proxy_resolver", # Android runs the packaged proxy resolver
# service in process and needs impl access.
"+services/proxy_resolver/public/interfaces",
"+services/proxy_resolver/public/mojom",
"+services/resource_coordinator/public/cpp",
"+services/resource_coordinator/public/interfaces",
"+services/service_manager",
......
......@@ -237,7 +237,7 @@
#include "services/network/public/cpp/resource_request.h"
#include "services/preferences/public/cpp/in_process_service_factory.h"
#include "services/preferences/public/mojom/preferences.mojom.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "services/service_manager/public/mojom/connector.mojom.h"
#include "services/service_manager/sandbox/sandbox_type.h"
#include "storage/browser/fileapi/external_mount_points.h"
......
......@@ -9,7 +9,7 @@
#include <string>
#include "base/macros.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/mojom/connector.mojom.h"
......
......@@ -17,7 +17,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/common/service_manager_connection.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
namespace {
......
......@@ -22,7 +22,7 @@
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/user_agent.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
network::mojom::NetworkContextParamsPtr CreateDefaultNetworkContextParams() {
network::mojom::NetworkContextParamsPtr network_context_params =
......
......@@ -37,7 +37,7 @@
#include "chrome/utility/importer/profile_import_service.h"
#include "services/network/url_request_context_builder_mojo.h"
#include "services/proxy_resolver/proxy_resolver_service.h" // nogncheck
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h" // nogncheck
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h" // nogncheck
#endif // !defined(OS_ANDROID)
#if defined(OS_WIN)
......
......@@ -42,7 +42,7 @@ include_rules = [
"+ppapi",
"+printing",
"+sandbox",
"+services/proxy_resolver/public/interfaces",
"+services/proxy_resolver/public/mojom",
"+services/service_manager/embedder",
"+skia",
......
......@@ -28,7 +28,7 @@
#include "net/test/event_waiter.h"
#include "net/test/gtest_util.h"
#include "services/network/proxy_service_mojo.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
......
......@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/proxy_resolver/proxy_resolver_factory_impl.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "services/service_manager/public/cpp/service_context_ref.h"
namespace content {
......
......@@ -9,7 +9,7 @@ include_rules = [
"+ipc",
"+net",
"+sandbox",
"+services/proxy_resolver/public/interfaces",
"+services/proxy_resolver/public/mojom",
"+services/service_manager/public",
"+services/service_manager/sandbox",
]
......@@ -29,7 +29,7 @@
#include "net/proxy_resolution/proxy_info.h"
#include "net/proxy_resolution/proxy_resolver.h"
#include "net/proxy_resolution/proxy_resolver_error_observer.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
namespace network {
......
......@@ -14,7 +14,7 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "net/base/completion_callback.h"
#include "net/proxy_resolution/proxy_resolver_factory.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
namespace net {
class HostResolver;
......
......@@ -33,7 +33,7 @@
#include "net/proxy_resolution/proxy_resolver_factory.h"
#include "net/test/event_waiter.h"
#include "net/test/gtest_util.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
......
......@@ -9,7 +9,7 @@
#include "base/component_export.h"
#include "net/proxy_resolution/dhcp_pac_file_fetcher.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
namespace net {
class HostResolver;
......
......@@ -41,7 +41,7 @@ component("cpp") {
"//ipc",
"//mojo/common",
"//net",
"//services/proxy_resolver/public/interfaces",
"//services/proxy_resolver/public/mojom",
]
defines = [ "IS_NETWORK_CPP_IMPL" ]
......
......@@ -14,6 +14,6 @@ specific_include_rules = {
# rather than to store user preferences.
"+components/prefs",
"+services/network",
"+services/proxy_resolver/public/interfaces",
"+services/proxy_resolver/public/mojom",
],
}
......@@ -77,7 +77,7 @@ mojom("mojom") {
":mutable_network_traffic_annotation_interface",
":udp_socket_interface",
"//mojo/common:common_custom_types",
"//services/proxy_resolver/public/interfaces",
"//services/proxy_resolver/public/mojom",
"//url/mojom:url_mojom_gurl",
]
......
......@@ -15,7 +15,7 @@ import "mojo/common/file_path.mojom";
import "mojo/common/time.mojom";
import "url/mojom/url.mojom";
import "services/network/public/mojom/udp_socket.mojom";
import "services/proxy_resolver/public/interfaces/proxy_resolver.mojom";
import "services/proxy_resolver/public/mojom/proxy_resolver.mojom";
// Parameters for constructing a network context.
struct NetworkContextParams {
......
......@@ -14,7 +14,7 @@
#include "net/url_request/url_request_context_builder.h"
#include "services/network/public/mojom/network_service.mojom.h"
#include "services/network/url_request_context_owner.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
namespace net {
class HostResolver;
......
......@@ -25,7 +25,7 @@ source_set("lib") {
]
public_deps = [
"//services/proxy_resolver/public/interfaces",
"//services/proxy_resolver/public/mojom",
"//services/service_manager/public/cpp",
]
}
......
......@@ -12,7 +12,7 @@
#include "base/callback.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "services/service_manager/public/cpp/service_context_ref.h"
namespace net {
......
......@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "net/proxy_resolution/proxy_resolver.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
namespace net {
class ProxyResolverV8Tracing;
......
......@@ -9,7 +9,7 @@
#include <string>
#include "services/proxy_resolver/proxy_resolver_factory_impl.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/service_context.h"
#include "services/service_manager/public/cpp/service_context_ref.h"
......
......@@ -7,7 +7,7 @@
#include <memory>
#include "base/test/scoped_task_environment.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#include "services/service_manager/public/cpp/test/test_connector_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
......
per-file *_struct_traits*.*=set noparent
per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
per-file *_mojom_traits*.*=set noparent
per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
per-file *.typemap=set noparent
per-file *.typemap=file://ipc/SECURITY_OWNERS
......@@ -2,15 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
mojom = "//services/proxy_resolver/public/interfaces/proxy_resolver.mojom"
mojom = "//services/proxy_resolver/public/mojom/proxy_resolver.mojom"
public_headers = [
"//net/base/proxy_server.h",
"//net/proxy_resolution/proxy_info.h",
]
traits_headers =
[ "//services/proxy_resolver/public/cpp/proxy_resolver_struct_traits.h" ]
[ "//services/proxy_resolver/public/cpp/proxy_resolver_mojom_traits.h" ]
sources = [
"//services/proxy_resolver/public/cpp/proxy_resolver_struct_traits.cc",
"//services/proxy_resolver/public/cpp/proxy_resolver_mojom_traits.cc",
]
type_mappings = [
"proxy_resolver.mojom.ProxyInfo=net::ProxyInfo",
......
......@@ -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 "services/proxy_resolver/public/cpp/proxy_resolver_struct_traits.h"
#include "services/proxy_resolver/public/cpp/proxy_resolver_mojom_traits.h"
#include "base/logging.h"
#include "net/base/host_port_pair.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 SERVICES_PROXY_RESOLVER_PUBLIC_CPP_PROXY_RESOLVER_STRUCT_TRAITS_H_
#define SERVICES_PROXY_RESOLVER_PUBLIC_CPP_PROXY_RESOLVER_STRUCT_TRAITS_H_
#ifndef SERVICES_PROXY_RESOLVER_PUBLIC_CPP_PROXY_RESOLVER_MOJOM_TRAITS_H_
#define SERVICES_PROXY_RESOLVER_PUBLIC_CPP_PROXY_RESOLVER_MOJOM_TRAITS_H_
#include "base/strings/string_piece.h"
#include "mojo/public/cpp/bindings/enum_traits.h"
......@@ -12,7 +12,7 @@
#include "net/base/proxy_server.h"
#include "net/proxy_resolution/proxy_info.h"
#include "net/proxy_resolution/proxy_list.h"
#include "services/proxy_resolver/public/interfaces/proxy_resolver.mojom.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
namespace net {
class ProxyInfo;
......@@ -57,4 +57,4 @@ struct StructTraits<proxy_resolver::mojom::ProxyInfoDataView, net::ProxyInfo> {
} // namespace mojo
#endif // SERVICES_PROXY_RESOLVER_PUBLIC_CPP_PROXY_RESOLVER_STRUCT_TRAITS_H_
#endif // SERVICES_PROXY_RESOLVER_PUBLIC_CPP_PROXY_RESOLVER_MOJOM_TRAITS_H_
......@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
mojom("interfaces") {
mojom("mojom") {
sources = [
"proxy_resolver.mojom",
]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment