From 7b2ffa587235a47d4094787d72f38102089f402a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 31 Jul 2019 15:50:41 +0200 Subject: BASELINE: Update Chromium to 76.0.3809.94 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael Brüning --- chromium/components/net_log/net_export_file_writer.cc | 11 +---------- .../components/net_log/net_export_file_writer_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'chromium/components/net_log') diff --git a/chromium/components/net_log/net_export_file_writer.cc b/chromium/components/net_log/net_export_file_writer.cc index 6f26a179bbf..462818ec838 100644 --- a/chromium/components/net_log/net_export_file_writer.cc +++ b/chromium/components/net_log/net_export_file_writer.cc @@ -184,20 +184,11 @@ void NetExportFileWriter::StartNetLogAfterCreateFile( if (!net_log_exporter_) return; - network::mojom::NetLogCaptureMode rpc_capture_mode = - network::mojom::NetLogCaptureMode::DEFAULT; - if (capture_mode.include_socket_bytes()) { - rpc_capture_mode = network::mojom::NetLogCaptureMode::INCLUDE_SOCKET_BYTES; - } else if (capture_mode.include_cookies_and_credentials()) { - rpc_capture_mode = - network::mojom::NetLogCaptureMode::INCLUDE_COOKIES_AND_CREDENTIALS; - } - // base::Unretained(this) is safe here since |net_log_exporter_| is owned by // |this| and is a mojo InterfacePtr, which guarantees callback cancellation // upon its destruction. net_log_exporter_->Start( - std::move(output_file), std::move(custom_constants), rpc_capture_mode, + std::move(output_file), std::move(custom_constants), capture_mode, max_file_size, base::BindOnce(&NetExportFileWriter::OnStartResult, base::Unretained(this), capture_mode)); diff --git a/chromium/components/net_log/net_export_file_writer_unittest.cc b/chromium/components/net_log/net_export_file_writer_unittest.cc index f5e6d3d28db..2d628d76cd2 100644 --- a/chromium/components/net_log/net_export_file_writer_unittest.cc +++ b/chromium/components/net_log/net_export_file_writer_unittest.cc @@ -68,7 +68,7 @@ class FakeNetLogExporter : public network::mojom::NetLogExporter { void Start(base::File destination, base::Value extra_constants, - network::mojom::NetLogCaptureMode capture_mode, + net::NetLogCaptureMode capture_mode, uint64_t max_file_size, StartCallback callback) override { std::move(callback).Run(net::OK); -- cgit v1.2.1