BASELINE: Update Chromium to 88.0.4324.208

Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 35 insertions, 10 deletions

diff --git a/chromium/net/log/file_net_log_observer.cc b/chromium/net/log/file_net_log_observer.cc
index b5573129702..337ff2a1892 100644
--- a/chromium/net/log/file_net_log_observer.cc
+++ b/chromium/net/log/file_net_log_observer.cc
@@ -333,17 +333,19 @@ class FileNetLogObserver::FileWriter {
 std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateBounded(
     const base::FilePath& log_path,
     uint64_t max_total_size,
+    NetLogCaptureMode capture_mode,
     std::unique_ptr<base::Value> constants) {
   return CreateInternal(log_path, SiblingInprogressDirectory(log_path),
                         base::nullopt, max_total_size, kDefaultNumFiles,
-                        std::move(constants));
+                        capture_mode, std::move(constants));
 }
 
 std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateUnbounded(
     const base::FilePath& log_path,
+    NetLogCaptureMode capture_mode,
     std::unique_ptr<base::Value> constants) {
   return CreateInternal(log_path, base::FilePath(), base::nullopt, kNoLimit,
-                        kDefaultNumFiles, std::move(constants));
+                        kDefaultNumFiles, capture_mode, std::move(constants));
 }
 
 std::unique_ptr<FileNetLogObserver>
@@ -351,19 +353,23 @@ FileNetLogObserver::CreateBoundedPreExisting(
     const base::FilePath& inprogress_dir_path,
     base::File output_file,
     uint64_t max_total_size,
+    NetLogCaptureMode capture_mode,
     std::unique_ptr<base::Value> constants) {
   return CreateInternal(base::FilePath(), inprogress_dir_path,
                         base::make_optional<base::File>(std::move(output_file)),
-                        max_total_size, kDefaultNumFiles, std::move(constants));
+                        max_total_size, kDefaultNumFiles, capture_mode,
+                        std::move(constants));
 }
 
 std::unique_ptr<FileNetLogObserver>
 FileNetLogObserver::CreateUnboundedPreExisting(
     base::File output_file,
+    NetLogCaptureMode capture_mode,
     std::unique_ptr<base::Value> constants) {
   return CreateInternal(base::FilePath(), base::FilePath(),
                         base::make_optional<base::File>(std::move(output_file)),
-                        kNoLimit, kDefaultNumFiles, std::move(constants));
+                        kNoLimit, kDefaultNumFiles, capture_mode,
+                        std::move(constants));
 }
 
 FileNetLogObserver::~FileNetLogObserver() {
@@ -378,9 +384,8 @@ FileNetLogObserver::~FileNetLogObserver() {
   file_task_runner_->DeleteSoon(FROM_HERE, file_writer_.release());
 }
 
-void FileNetLogObserver::StartObserving(NetLog* net_log,
-                                        NetLogCaptureMode capture_mode) {
-  net_log->AddObserver(this, capture_mode);
+void FileNetLogObserver::StartObserving(NetLog* net_log) {
+  net_log->AddObserver(this, capture_mode_);
 }
 
 void FileNetLogObserver::StopObserving(std::unique_ptr<base::Value> polled_data,
@@ -425,10 +430,11 @@ std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateBoundedForTests(
     const base::FilePath& log_path,
     uint64_t max_total_size,
     size_t total_num_event_files,
+    NetLogCaptureMode capture_mode,
     std::unique_ptr<base::Value> constants) {
   return CreateInternal(log_path, SiblingInprogressDirectory(log_path),
                         base::nullopt, max_total_size, total_num_event_files,
-                        std::move(constants));
+                        capture_mode, std::move(constants));
 }
 
 std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateInternal(
@@ -437,6 +443,7 @@ std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateInternal(
     base::Optional<base::File> pre_existing_log_file,
     uint64_t max_total_size,
     size_t total_num_event_files,
+    NetLogCaptureMode capture_mode,
     std::unique_ptr<base::Value> constants) {
   DCHECK_GT(total_num_event_files, 0u);
 
@@ -469,25 +476,43 @@ std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateInternal(
   return base::WrapUnique(new FileNetLogObserver(
       file_task_runner, std::move(file_writer),
       base::WrapRefCounted(new WriteQueue(write_queue_memory_max)),
-      std::move(constants)));
+      capture_mode, std::move(constants)));
 }
 
 FileNetLogObserver::FileNetLogObserver(
     scoped_refptr<base::SequencedTaskRunner> file_task_runner,
     std::unique_ptr<FileWriter> file_writer,
     scoped_refptr<WriteQueue> write_queue,
+    NetLogCaptureMode capture_mode,
     std::unique_ptr<base::Value> constants)
     : file_task_runner_(std::move(file_task_runner)),
       write_queue_(std::move(write_queue)),
-      file_writer_(std::move(file_writer)) {
+      file_writer_(std::move(file_writer)),
+      capture_mode_(capture_mode) {
   if (!constants)
     constants = base::Value::ToUniquePtrValue(GetNetConstants());
+
+  DCHECK(!constants->FindKey("logCaptureMode"));
+  constants->SetStringKey("logCaptureMode", CaptureModeToString(capture_mode));
   file_task_runner_->PostTask(
       FROM_HERE, base::BindOnce(&FileNetLogObserver::FileWriter::Initialize,
                                 base::Unretained(file_writer_.get()),
                                 std::move(constants)));
 }
 
+std::string FileNetLogObserver::CaptureModeToString(NetLogCaptureMode mode) {
+  switch (mode) {
+    case NetLogCaptureMode::kDefault:
+      return "Default";
+    case NetLogCaptureMode::kIncludeSensitive:
+      return "IncludeSensitive";
+    case NetLogCaptureMode::kEverything:
+      return "Everything";
+  }
+  NOTREACHED();
+  return "UNKNOWN";
+}
+
 FileNetLogObserver::WriteQueue::WriteQueue(uint64_t memory_max)
     : memory_(0), memory_max_(memory_max) {}