Commit e9ccdaed authored by Chih-Hsuan Kuo's avatar Chih-Hsuan Kuo Committed by Commit Bot

Don't create MemoryPressureMonitor for Chromecast

Chromecast creates MemoryPressureMonitor and evaluator itself in
CastBrowserMainParts::PreMainMessageLoopRun and that it conflicts with
Chromium adding a MemoryPressureMonitor in the following CL and causes a
fatal error when creating MemoryPressureMonitor:
https://chromium-review.googlesource.com/c/chromium/src/+/1386856

Bug: 1125990
Test: Pass CQ
Change-Id: I8fb76f6fcbc725b9b5e252898dc8d75a17d41bf0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2397990Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Chih-Hsuan Kuo <chkuo@google.com>
Auto-Submit: Chih-Hsuan Kuo <chkuo@google.com>
Cr-Commit-Position: refs/heads/master@{#805215}
parent 5daf8213
...@@ -51,6 +51,7 @@ source_set("browser") { ...@@ -51,6 +51,7 @@ source_set("browser") {
"//base/util/ranges:ranges", "//base/util/ranges:ranges",
"//build:branding_buildflags", "//build:branding_buildflags",
"//build:chromeos_buildflags", "//build:chromeos_buildflags",
"//build:chromecast_buildflags",
"//cc", "//cc",
"//cc/animation", "//cc/animation",
"//cc/mojo_embedder", "//cc/mojo_embedder",
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include "base/util/memory_pressure/multi_source_memory_pressure_monitor.h" #include "base/util/memory_pressure/multi_source_memory_pressure_monitor.h"
#include "build/branding_buildflags.h" #include "build/branding_buildflags.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "build/chromecast_buildflags.h"
#include "cc/base/histograms.h" #include "cc/base/histograms.h"
#include "components/discardable_memory/service/discardable_shared_memory_manager.h" #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
#include "components/services/storage/dom_storage/storage_area_impl.h" #include "components/services/storage/dom_storage/storage_area_impl.h"
...@@ -366,7 +367,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMemoryPressureMonitor( ...@@ -366,7 +367,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMemoryPressureMonitor(
if (chromeos::switches::MemoryPressureHandlingEnabled()) if (chromeos::switches::MemoryPressureHandlingEnabled())
monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>(); monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>();
#elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_FUCHSIA) || \ #elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_FUCHSIA) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS)) (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST))
monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>(); monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>();
#endif #endif
// No memory monitor on other platforms... // No memory monitor on other platforms...
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment