Commit 11766612 authored by Helen Li's avatar Helen Li Committed by Commit Bot

Move a few mojo types out of url_loader.mojom so they can be shared.

This CL moves a few mojo types out of url_loader.mojom so they can be shared
(e.g. with the new tls socket APIs).

Bug: 721401
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: Ie613dc08b32eb0541ef43137dee1ac4f515cc078
Reviewed-on: https://chromium-review.googlesource.com/962991Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543810}
parent a3d57146
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
mojom = "//services/network/public/mojom/url_loader.mojom" mojom = "//services/network/public/mojom/network_param.mojom"
public_headers = [ public_headers = [
"//net/base/auth.h", "//net/base/auth.h",
"//net/base/host_port_pair.h", "//net/base/host_port_pair.h",
......
...@@ -63,6 +63,7 @@ mojom("mojom") { ...@@ -63,6 +63,7 @@ mojom("mojom") {
"fetch_api.mojom", "fetch_api.mojom",
"http_request_headers.mojom", "http_request_headers.mojom",
"network_change_manager.mojom", "network_change_manager.mojom",
"network_param.mojom",
"network_service.mojom", "network_service.mojom",
"network_service_test.mojom", "network_service_test.mojom",
"network_types.mojom", "network_types.mojom",
......
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
module network.mojom;
[Native]
struct AuthChallengeInfo;
[Native]
struct AuthCredentials;
[Native]
struct CertVerifyResult;
[Native]
struct HostPortPair;
[Native]
struct X509Certificate;
[Native]
struct SSLCertRequestInfo;
[Native]
struct SSLInfo;
...@@ -16,18 +16,13 @@ import "services/network/public/mojom/proxy_config_with_annotation.mojom"; ...@@ -16,18 +16,13 @@ import "services/network/public/mojom/proxy_config_with_annotation.mojom";
import "services/network/public/mojom/tcp_socket.mojom"; import "services/network/public/mojom/tcp_socket.mojom";
import "services/network/public/mojom/udp_socket.mojom"; import "services/network/public/mojom/udp_socket.mojom";
import "services/network/public/mojom/url_loader.mojom"; import "services/network/public/mojom/url_loader.mojom";
import "services/network/public/mojom/network_param.mojom";
import "services/network/public/mojom/url_loader_factory.mojom"; import "services/network/public/mojom/url_loader_factory.mojom";
import "services/proxy_resolver/public/mojom/proxy_resolver.mojom"; import "services/proxy_resolver/public/mojom/proxy_resolver.mojom";
import "services/network/public/mojom/restricted_cookie_manager.mojom"; import "services/network/public/mojom/restricted_cookie_manager.mojom";
import "url/mojom/origin.mojom"; import "url/mojom/origin.mojom";
import "url/mojom/url.mojom"; import "url/mojom/url.mojom";
[Native]
struct AuthChallengeInfo;
[Native]
struct AuthCredentials;
// Parameters for constructing a network context. // Parameters for constructing a network context.
struct NetworkContextParams { struct NetworkContextParams {
// Name used by memory tools to identify the context. // Name used by memory tools to identify the context.
......
...@@ -5,12 +5,7 @@ ...@@ -5,12 +5,7 @@
module network.mojom; module network.mojom;
import "services/network/public/mojom/network_change_manager.mojom"; import "services/network/public/mojom/network_change_manager.mojom";
import "services/network/public/mojom/network_param.mojom";
[Native]
struct CertVerifyResult;
[Native]
struct X509Certificate;
struct Rule { struct Rule {
string host_pattern; string host_pattern;
......
...@@ -4,18 +4,14 @@ ...@@ -4,18 +4,14 @@
module network.mojom; module network.mojom;
import "services/network/public/mojom/network_param.mojom";
[Native] [Native]
struct URLRequest; struct URLRequest;
[Native] [Native]
struct URLResponseHead; struct URLResponseHead;
[Native]
struct SSLCertRequestInfo;
[Native]
struct SSLInfo;
[Native] [Native]
struct URLRequestRedirectInfo; struct URLRequestRedirectInfo;
...@@ -25,9 +21,6 @@ struct CORSErrorStatus; ...@@ -25,9 +21,6 @@ struct CORSErrorStatus;
[Native] [Native]
struct URLLoaderCompletionStatus; struct URLLoaderCompletionStatus;
[Native]
struct X509Certificate;
// This enum corresponds to net::RequestPriority. See its comments for details. // This enum corresponds to net::RequestPriority. See its comments for details.
enum RequestPriority { enum RequestPriority {
kThrottled = 0, kThrottled = 0,
......
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