
This reverts commitbcc9fcd9e7
. Reason for revert: Fixed ubsan failures The fix diff can be reviewed here: crrev.com/c/6360858/1..2 Original change's description: > Revert "Clickiness: Wire response from URLLoader to DB, add e2e tests" > > This reverts commitc321aa7496
. > > Reason for revert: > LUCI Bisection has identified this change as the cause of a test failure. See the analysis: https://ci.chromium.org/ui/p/chromium/bisection/test-analysis/b/4996809668689920 > > Sample build with failed test: https://ci.chromium.org/b/8720390641933726001 > Affected test(s): > [ninja://chrome/test:unit_tests/CRLSetComponentInstallerTest.ConfiguresOnInstall](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:unit_tests%2FCRLSetComponentInstallerTest.ConfiguresOnInstall?q=VHash%3A799aae891109c818) > [ninja://chrome/test:unit_tests/CRLSetComponentInstallerTest.StillConfiguredAfterNetworkServiceRestartWithCRLSet](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:unit_tests%2FCRLSetComponentInstallerTest.StillConfiguredAfterNetworkServiceRestartWithCRLSet?q=VHash%3A799aae891109c818) > [ninja://chrome/test:unit_tests/DevToolsUIDataSourceWithTaskEnvTest.GotDataCallbackOwnsDevToolsDataSource](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:unit_tests%2FDevToolsUIDataSourceWithTaskEnvTest.GotDataCallbackOwnsDevToolsDataSource?q=VHash%3A799aae891109c818) > [ninja://chrome/test:unit_tests/EmbeddedPolicyTestServerTest.HandleRequest_Success](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:unit_tests%2FEmbeddedPolicyTestServerTest.HandleRequest_Success?q=VHash%3A799aae891109c818) > [ninja://chrome/test:unit_tests/PerformNetworkContextPrefetchRecorderTest.Style](https://ci.chromium.org/ui/test/chromium/ninja:%2F%2Fchrome%2Ftest:unit_tests%2FPerformNetworkContextPrefetchRecorderTest.Style?q=VHash%3A799aae891109c818) > and 7 more ... > > If this is a false positive, please report it at http://b.corp.google.com/createIssue?component=1199205&description=Analysis%3A+https%3A%2F%2Fci.chromium.org%2Fui%2Fp%2Fchromium%2Fbisection%2Ftest-analysis%2Fb%2F4996809668689920&format=PLAIN&priority=P3&title=Wrongly+blamed+https%3A%2F%2Fchromium-review.googlesource.com%2Fc%2Fchromium%2Fsrc%2F%2B%2F6336937&type=BUG > > Original change's description: > > Clickiness: Wire response from URLLoader to DB, add e2e tests > > > > Checking if origins are allowed (allowed by user settings, attested, > > etc.) will come in a subsequent CL. > > > > Doesn't include the redirection logic -- that will land in crrev.com/c/6353624. > > > > Bug: 394108643 > > Change-Id: Ic3897262c17afa7a7cbae967b9f266277ea77a80 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6336937 > > Auto-Submit: Caleb Raitto <caraitto@chromium.org> > > Commit-Queue: Yuwei Huang <yuweih@chromium.org> > > Reviewed-by: Maks Orlovich <morlovich@chromium.org> > > Reviewed-by: Kenichi Ishibashi <bashi@chromium.org> > > Reviewed-by: James Cook <jamescook@chromium.org> > > Reviewed-by: Yuwei Huang <yuweih@chromium.org> > > Reviewed-by: Austin Sullivan <asully@chromium.org> > > Reviewed-by: Ken Buchanan <kenrb@chromium.org> > > Cr-Commit-Position: refs/heads/main@{#1432935} > > > > Bug: 394108643 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Change-Id: Iab03915999352e60653433ae4f460df9effdd323 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6356884 > Commit-Queue: Austin Sullivan <asully@chromium.org> > Owners-Override: Austin Sullivan <asully@chromium.org> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Austin Sullivan <asully@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1433038} Bug: 394108643 Fixed: 403652961 Change-Id: Ic6eb6bee6008e67afe247f28131ff8ce347074ea Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6360858 Reviewed-by: Yuwei Huang <yuweih@chromium.org> Reviewed-by: Austin Sullivan <asully@chromium.org> Auto-Submit: Caleb Raitto <caraitto@chromium.org> Reviewed-by: James Cook <jamescook@chromium.org> Reviewed-by: Kenichi Ishibashi <bashi@chromium.org> Reviewed-by: Ken Buchanan <kenrb@chromium.org> Reviewed-by: Maks Orlovich <morlovich@chromium.org> Commit-Queue: Caleb Raitto <caraitto@chromium.org> Cr-Commit-Position: refs/heads/main@{#1434209}
172 lines
6.6 KiB
C++
172 lines
6.6 KiB
C++
// Copyright 2017 The Chromium Authors
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef CONTENT_BROWSER_NETWORK_SERVICE_CLIENT_H_
|
|
#define CONTENT_BROWSER_NETWORK_SERVICE_CLIENT_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "base/memory/memory_pressure_listener.h"
|
|
#include "base/unguessable_token.h"
|
|
#include "build/build_config.h"
|
|
#include "content/browser/network/socket_broker_impl.h"
|
|
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
|
#include "mojo/public/cpp/bindings/receiver.h"
|
|
#include "mojo/public/cpp/bindings/receiver_set.h"
|
|
#include "mojo/public/cpp/bindings/remote.h"
|
|
#include "net/cert/cert_database.h"
|
|
#include "services/network/public/mojom/network_change_manager.mojom.h"
|
|
#include "services/network/public/mojom/network_service.mojom.h"
|
|
#include "services/network/public/mojom/url_loader_network_service_observer.mojom.h"
|
|
#include "url/gurl.h"
|
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
#include "base/android/application_status_listener.h"
|
|
#endif
|
|
|
|
namespace content {
|
|
|
|
class WebRtcConnectionsObserver;
|
|
|
|
class NetworkServiceClient
|
|
: public network::mojom::URLLoaderNetworkServiceObserver,
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
|
public net::NetworkChangeNotifier::ConnectionTypeObserver,
|
|
public net::NetworkChangeNotifier::MaxBandwidthObserver,
|
|
public net::NetworkChangeNotifier::IPAddressObserver,
|
|
#endif
|
|
public net::CertDatabase::Observer {
|
|
public:
|
|
NetworkServiceClient();
|
|
|
|
NetworkServiceClient(const NetworkServiceClient&) = delete;
|
|
NetworkServiceClient& operator=(const NetworkServiceClient&) = delete;
|
|
|
|
~NetworkServiceClient() override;
|
|
|
|
mojo::PendingRemote<network::mojom::URLLoaderNetworkServiceObserver>
|
|
BindURLLoaderNetworkServiceObserver();
|
|
|
|
// Called when SetParams() is called on the associated network service.
|
|
void OnNetworkServiceInitialized(network::mojom::NetworkService* service);
|
|
|
|
// net::CertDatabase::Observer implementation:
|
|
void OnTrustStoreChanged() override;
|
|
void OnClientCertStoreChanged() override;
|
|
|
|
void OnMemoryPressure(
|
|
base::MemoryPressureListener::MemoryPressureLevel memory_presure_level);
|
|
|
|
// Called when there is a change in the count of media connections that
|
|
// require low network latency.
|
|
void OnPeerToPeerConnectionsCountChange(uint32_t count);
|
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
void OnApplicationStateChange(base::android::ApplicationState state);
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
|
// net::NetworkChangeNotifier::ConnectionTypeObserver implementation:
|
|
void OnConnectionTypeChanged(
|
|
net::NetworkChangeNotifier::ConnectionType type) override;
|
|
|
|
// net::NetworkChangeNotifier::MaxBandwidthObserver implementation:
|
|
void OnMaxBandwidthChanged(
|
|
double max_bandwidth_mbps,
|
|
net::NetworkChangeNotifier::ConnectionType type) override;
|
|
|
|
// net::NetworkChangeNotifier::IPAddressObserver implementation:
|
|
void OnIPAddressChanged() override;
|
|
#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
// Called when the network service sandbox is enabled.
|
|
mojo::PendingRemote<network::mojom::SocketBroker> BindSocketBroker();
|
|
#endif
|
|
|
|
private:
|
|
// network::mojom::URLLoaderNetworkServiceObserver overrides.
|
|
void OnSSLCertificateError(const GURL& url,
|
|
int net_error,
|
|
const net::SSLInfo& ssl_info,
|
|
bool fatal,
|
|
OnSSLCertificateErrorCallback response) override;
|
|
void OnCertificateRequested(
|
|
const std::optional<base::UnguessableToken>& window_id,
|
|
const scoped_refptr<net::SSLCertRequestInfo>& cert_info,
|
|
mojo::PendingRemote<network::mojom::ClientCertificateResponder>
|
|
cert_responder) override;
|
|
void OnAuthRequired(
|
|
const std::optional<base::UnguessableToken>& window_id,
|
|
int32_t request_id,
|
|
const GURL& url,
|
|
bool first_auth_attempt,
|
|
const net::AuthChallengeInfo& auth_info,
|
|
const scoped_refptr<net::HttpResponseHeaders>& head_headers,
|
|
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
|
|
auth_challenge_responder) override;
|
|
void OnPrivateNetworkAccessPermissionRequired(
|
|
const GURL& url,
|
|
const net::IPAddress& ip_address,
|
|
const std::optional<std::string>& private_network_device_id,
|
|
const std::optional<std::string>& private_network_device_name,
|
|
OnPrivateNetworkAccessPermissionRequiredCallback callback) override;
|
|
void OnClearSiteData(
|
|
const GURL& url,
|
|
const std::string& header_value,
|
|
int load_flags,
|
|
const std::optional<net::CookiePartitionKey>& cookie_partition_key,
|
|
bool partitioned_state_allowed_only,
|
|
OnClearSiteDataCallback callback) override;
|
|
void OnLoadingStateUpdate(network::mojom::LoadInfoPtr info,
|
|
OnLoadingStateUpdateCallback callback) override;
|
|
void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
|
|
int64_t recv_bytes,
|
|
int64_t sent_bytes) override;
|
|
void OnSharedStorageHeaderReceived(
|
|
const url::Origin& request_origin,
|
|
std::vector<network::mojom::SharedStorageModifierMethodWithOptionsPtr>
|
|
methods_with_options,
|
|
const std::optional<std::string>& with_lock,
|
|
OnSharedStorageHeaderReceivedCallback callback) override;
|
|
void OnAdAuctionEventRecordHeaderReceived(
|
|
network::AdAuctionEventRecord event_record) override;
|
|
void Clone(
|
|
mojo::PendingReceiver<network::mojom::URLLoaderNetworkServiceObserver>
|
|
listener) override;
|
|
void OnWebSocketConnectedToPrivateNetwork(
|
|
network::mojom::IPAddressSpace ip_address_space) override;
|
|
void OnUrlLoaderConnectedToPrivateNetwork(
|
|
const GURL& request_url,
|
|
network::mojom::IPAddressSpace response_address_space,
|
|
network::mojom::IPAddressSpace client_address_space,
|
|
network::mojom::IPAddressSpace target_address_space) override;
|
|
|
|
std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
|
|
|
|
std::unique_ptr<WebRtcConnectionsObserver> webrtc_connections_observer_;
|
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
std::unique_ptr<base::android::ApplicationStatusListener>
|
|
app_status_listener_;
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
|
mojo::Remote<network::mojom::NetworkChangeManager> network_change_manager_;
|
|
#endif // BUILDFLAG(IS_ANDROID)
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
SocketBrokerImpl socket_broker_;
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
mojo::ReceiverSet<network::mojom::URLLoaderNetworkServiceObserver>
|
|
url_loader_network_service_observers_;
|
|
};
|
|
|
|
} // namespace content
|
|
|
|
#endif // CONTENT_BROWSER_NETWORK_SERVICE_CLIENT_H_
|