BASELINE: Update Chromium to 85.0.4183.14085-based

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

8 files changed, 32 insertions, 18 deletions

diff --git a/chromium/base/util/memory_pressure/memory_pressure_voter.cc b/chromium/base/util/memory_pressure/memory_pressure_voter.cc
index 56c2d70b24d..2c7e29d9f82 100644
--- a/chromium/base/util/memory_pressure/memory_pressure_voter.cc
+++ b/chromium/base/util/memory_pressure/memory_pressure_voter.cc
@@ -7,7 +7,7 @@
 #include <numeric>
 
 #include "base/stl_util.h"
-#include "base/trace_event/trace_event.h"
+#include "base/trace_event/base_tracing.h"
 
 namespace util {
 
diff --git a/chromium/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc b/chromium/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc
index 74f966381a4..576a83742b6 100644
--- a/chromium/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc
+++ b/chromium/base/util/memory_pressure/multi_source_memory_pressure_monitor.cc
@@ -9,7 +9,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
-#include "base/trace_event/trace_event.h"
+#include "base/trace_event/base_tracing.h"
 #include "base/util/memory_pressure/system_memory_pressure_evaluator.h"
 
 namespace util {
diff --git a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator.cc b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator.cc
index a13c40dc7aa..c624b928cb0 100644
--- a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator.cc
+++ b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator.cc
@@ -7,6 +7,8 @@
 #include "build/build_config.h"
 
 #if defined(OS_CHROMEOS)
+#include "base/logging.h"
+#include "base/system/sys_info.h"
 #include "base/util/memory_pressure/system_memory_pressure_evaluator_chromeos.h"
 #elif defined(OS_FUCHSIA)
 #include "base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia.h"
@@ -28,8 +30,9 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEvaluator(
     return std::make_unique<util::chromeos::SystemMemoryPressureEvaluator>(
         monitor->CreateVoter());
   }
-  LOG(ERROR) << "No MemoryPressureMonitor created because the kernel does "
-                "not support notifications.";
+  LOG_IF(ERROR, base::SysInfo::IsRunningOnChromeOS())
+      << "No MemoryPressureMonitor created because the kernel does not have "
+         "support.";
 #elif defined(OS_FUCHSIA)
   return std::make_unique<util::SystemMemoryPressureEvaluatorFuchsia>(
       monitor->CreateVoter());
diff --git a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos.cc b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos.cc
index f8b3791b2b0..4acac008e83 100644
--- a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos.cc
+++ b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos.cc
@@ -10,6 +10,7 @@
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/no_destructor.h"
 #include "base/posix/eintr_wrapper.h"
@@ -76,8 +77,11 @@ GetMemoryPressureLevelFromAvailable(int available_mb,
 
 uint64_t ReadFileToUint64(const base::FilePath& file) {
   std::string file_contents;
-  if (!ReadFileToString(file, &file_contents))
+  if (!base::ReadFileToStringNonBlocking(file, &file_contents)) {
+    PLOG_IF(ERROR, base::SysInfo::IsRunningOnChromeOS())
+        << "Unable to read uint64 from: " << file;
     return 0;
+  }
   TrimWhitespaceASCII(file_contents, base::TRIM_ALL, &file_contents);
   uint64_t file_contents_uint64 = 0;
   if (!base::StringToUint64(file_contents, &file_contents_uint64))
@@ -211,7 +215,8 @@ std::vector<int> SystemMemoryPressureEvaluator::GetMarginFileParts(
     const std::string& file) {
   std::vector<int> margin_values;
   std::string margin_contents;
-  if (base::ReadFileToString(base::FilePath(file), &margin_contents)) {
+  if (base::ReadFileToStringNonBlocking(base::FilePath(file),
+                                        &margin_contents)) {
     std::vector<std::string> margins =
         base::SplitString(margin_contents, base::kWhitespaceASCII,
                           base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
@@ -226,7 +231,8 @@ std::vector<int> SystemMemoryPressureEvaluator::GetMarginFileParts(
       margin_values.push_back(value);
     }
   } else {
-    LOG(ERROR) << "Unable to read margin file: " << kMarginMemFile;
+    PLOG_IF(ERROR, base::SysInfo::IsRunningOnChromeOS())
+        << "Unable to read margin file: " << kMarginMemFile;
   }
   return margin_values;
 }
@@ -305,8 +311,9 @@ uint64_t SystemMemoryPressureEvaluator::CalculateReservedFreeKB(
 
 uint64_t SystemMemoryPressureEvaluator::GetReservedMemoryKB() {
   std::string file_contents;
-  if (!ReadFileToString(base::FilePath("/proc/zoneinfo"), &file_contents)) {
-    LOG(ERROR) << "Couldn't get /proc/zoneinfo";
+  if (!base::ReadFileToStringNonBlocking(base::FilePath("/proc/zoneinfo"),
+                                         &file_contents)) {
+    PLOG(ERROR) << "Couldn't get /proc/zoneinfo";
     return 0;
   }
 
diff --git a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos_unittest.cc b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos_unittest.cc
index 10dd507b5fc..617ec32499a 100644
--- a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos_unittest.cc
+++ b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_chromeos_unittest.cc
@@ -251,7 +251,7 @@ TEST(ChromeOSSystemMemoryPressureEvaluatorTest, CheckMemoryPressure) {
   std::vector<base::MemoryPressureListener::MemoryPressureLevel>
       pressure_events;
   auto listener = std::make_unique<base::MemoryPressureListener>(
-      base::BindRepeating(&OnMemoryPressure, &pressure_events));
+      FROM_HERE, base::BindRepeating(&OnMemoryPressure, &pressure_events));
 
   MultiSourceMemoryPressureMonitor monitor;
   monitor.ResetSystemEvaluatorForTesting();
diff --git a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia.cc b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia.cc
index 8e4a9a98197..4ab74247683 100644
--- a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia.cc
+++ b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia.cc
@@ -6,8 +6,8 @@
 
 #include <lib/sys/cpp/component_context.h>
 
-#include "base/fuchsia/default_context.h"
 #include "base/fuchsia/fuchsia_logging.h"
+#include "base/fuchsia/process_context.h"
 #include "base/util/memory_pressure/memory_pressure_voter.h"
 
 namespace util {
@@ -34,13 +34,11 @@ SystemMemoryPressureEvaluatorFuchsia::SystemMemoryPressureEvaluatorFuchsia(
     std::unique_ptr<util::MemoryPressureVoter> voter)
     : util::SystemMemoryPressureEvaluator(std::move(voter)), binding_(this) {
   binding_.set_error_handler([](zx_status_t status) {
-    // TODO(https://crbug.com/1020698): Update fuchsia.web docs to make this a
-    // required service, and make this a FATAL log.
-    ZX_LOG(WARNING, status) << "fuchsia.memorypressure.Provider disconnected.";
+    ZX_LOG(FATAL, status) << "fuchsia.memorypressure.Provider disconnected";
   });
 
   DVLOG(1) << "Registering for memory pressure updates.";
-  auto provider = base::fuchsia::ComponentContextForCurrentProcess()
+  auto provider = base::ComponentContextForProcess()
                       ->svc()
                       ->Connect<fuchsia::memorypressure::Provider>();
   provider->RegisterWatcher(binding_.NewBinding());
diff --git a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia_unittest.cc b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia_unittest.cc
index 545a404bd92..3cd3aae600f 100644
--- a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia_unittest.cc
+++ b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_fuchsia_unittest.cc
@@ -60,13 +60,18 @@ class SystemMemoryPressureEvaluatorFuchsiaTest
   fuchsia::memorypressure::WatcherPtr watcher_;
 };
 
-TEST_F(SystemMemoryPressureEvaluatorFuchsiaTest, ProviderUnavailable) {
+using SystemMemoryPressureEvaluatorFuchsiaDeathTest =
+    SystemMemoryPressureEvaluatorFuchsiaTest;
+
+TEST_F(SystemMemoryPressureEvaluatorFuchsiaDeathTest, ProviderUnavailable) {
   auto voter = std::make_unique<MockMemoryPressureVoter>();
   SystemMemoryPressureEvaluatorFuchsia evaluator(std::move(voter));
 
   // Spin the loop to allow the evaluator to notice that the Provider is not
-  // available, to verify that that doesn't trigger a fatal failure.
-  base::RunLoop().RunUntilIdle();
+  // available and verify that this causes a fatal failure.
+  ASSERT_DEATH(base::RunLoop().RunUntilIdle(),
+               "fuchsia\\.memorypressure\\.Provider disconnected: "
+               "ZX_ERR_PEER_CLOSED \\(-24\\)");
 }
 
 TEST_F(SystemMemoryPressureEvaluatorFuchsiaTest, Basic) {
diff --git a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc
index 3e0297366b6..4fc5591373f 100644
--- a/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc
+++ b/chromium/base/util/memory_pressure/system_memory_pressure_evaluator_win_unittest.cc
@@ -214,6 +214,7 @@ TEST_F(WinSystemMemoryPressureEvaluatorTest, CheckMemoryPressure) {
       true, monitor.CreateVoter());
 
   base::MemoryPressureListener listener(
+      FROM_HERE,
       base::BindRepeating(&TestSystemMemoryPressureEvaluator::OnMemoryPressure,
                           base::Unretained(&evaluator)));