Commit 99ece212 authored by Hwanseung Lee's avatar Hwanseung Lee Committed by Commit Bot

[jumbo] fix the build fail when using jumbo

There are multiple g_monitor globals after patch[1].
let's rename one of them to avoid jumbo build breakage.

[1]https://chromium-review.googlesource.com/c/chromium/src/+/1540309

Bug: 775547
Change-Id: I2dbb0f812e61e91f644760b24ae9aa3e1db03f13
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1592974
Commit-Queue: François Doray <fdoray@chromium.org>
Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#655973}
parent 738c9739
...@@ -28,13 +28,13 @@ namespace base { ...@@ -28,13 +28,13 @@ namespace base {
namespace chromeos { namespace chromeos {
namespace { namespace {
// Type-safe version of |g_monitor| from base/memory/memory_pressure_monitor.cc, // Type-safe version of |g_monitor_notifying| from
// this was originally added because TabManagerDelegate for chromeos needs to // base/memory/memory_pressure_monitor.cc, this was originally added because
// call into ScheduleEarlyCheck which isn't a public API in the base // TabManagerDelegate for chromeos needs to call into ScheduleEarlyCheck which
// MemoryPressureMonitor. This matters because ChromeOS may create a // isn't a public API in the base MemoryPressureMonitor. This matters because
// FakeMemoryPressureMonitor for browser tests and that's why this type-specific // ChromeOS may create a FakeMemoryPressureMonitor for browser tests and that's
// version was added. // why this type-specific version was added.
MemoryPressureMonitorNotifying* g_monitor = nullptr; MemoryPressureMonitorNotifying* g_monitor_notifying = nullptr;
// We try not to re-notify on moderate too frequently, this time // We try not to re-notify on moderate too frequently, this time
// controls how frequently we will notify after our first notification. // controls how frequently we will notify after our first notification.
...@@ -132,8 +132,8 @@ MemoryPressureMonitorNotifying::MemoryPressureMonitorNotifying( ...@@ -132,8 +132,8 @@ MemoryPressureMonitorNotifying::MemoryPressureMonitorNotifying(
base::BindRepeating(std::move(kernel_waiting_callback), base::BindRepeating(std::move(kernel_waiting_callback),
available_mem_file_.get())), available_mem_file_.get())),
weak_ptr_factory_(this) { weak_ptr_factory_(this) {
DCHECK(g_monitor == nullptr); DCHECK(g_monitor_notifying == nullptr);
g_monitor = this; g_monitor_notifying = this;
CHECK(available_mem_file_.is_valid()); CHECK(available_mem_file_.is_valid());
std::vector<int> margin_parts = std::vector<int> margin_parts =
...@@ -160,8 +160,8 @@ MemoryPressureMonitorNotifying::MemoryPressureMonitorNotifying( ...@@ -160,8 +160,8 @@ MemoryPressureMonitorNotifying::MemoryPressureMonitorNotifying(
} }
MemoryPressureMonitorNotifying::~MemoryPressureMonitorNotifying() { MemoryPressureMonitorNotifying::~MemoryPressureMonitorNotifying() {
DCHECK(g_monitor); DCHECK(g_monitor_notifying);
g_monitor = nullptr; g_monitor_notifying = nullptr;
} }
std::vector<int> MemoryPressureMonitorNotifying::GetMarginFileParts() { std::vector<int> MemoryPressureMonitorNotifying::GetMarginFileParts() {
...@@ -305,7 +305,7 @@ void MemoryPressureMonitorNotifying::SetDispatchCallback( ...@@ -305,7 +305,7 @@ void MemoryPressureMonitorNotifying::SetDispatchCallback(
// static // static
MemoryPressureMonitorNotifying* MemoryPressureMonitorNotifying::Get() { MemoryPressureMonitorNotifying* MemoryPressureMonitorNotifying::Get() {
return g_monitor; return g_monitor_notifying;
} }
} // namespace chromeos } // namespace chromeos
......
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