summaryrefslogtreecommitdiff
path: root/chromium/components/net_log
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-31 15:50:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:35:23 +0000
commit7b2ffa587235a47d4094787d72f38102089f402a (patch)
tree30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/components/net_log
parentd94af01c90575348c4e81a418257f254b6f8d225 (diff)
downloadqtwebengine-chromium-7b2ffa587235a47d4094787d72f38102089f402a.tar.gz
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/net_log')
-rw-r--r--chromium/components/net_log/net_export_file_writer.cc11
-rw-r--r--chromium/components/net_log/net_export_file_writer_unittest.cc2
2 files changed, 2 insertions, 11 deletions
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);