| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index 98b6dd8f8be41feb0d53589414d5125f1c6c67e0..b258f5a3aeac722f2611bc9967f680a51dcb8db6 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -64,7 +64,7 @@
|
| #include "base/mac/scoped_nsautorelease_pool.h"
|
| #if !defined(OS_IOS)
|
| #include "base/mach_ipc_mac.h"
|
| -#include "base/system_monitor/system_monitor.h"
|
| +#include "base/power_monitor/power_monitor.h"
|
| #include "content/browser/mach_broker_mac.h"
|
| #include "content/common/sandbox_init_mac.h"
|
| #endif // !OS_IOS
|
| @@ -621,7 +621,7 @@ static void ReleaseFreeMemoryThunk() {
|
|
|
| #if defined(OS_MACOSX) && !defined(OS_IOS)
|
| // We need to allocate the IO Ports before the Sandbox is initialized or
|
| - // the first instance of SystemMonitor is created.
|
| + // the first instance of PowerMonitor is created.
|
| // It's important not to allocate the ports for processes which don't
|
| // register with the system monitor - see crbug.com/88867.
|
| if (process_type.empty() ||
|
| @@ -631,7 +631,7 @@ static void ReleaseFreeMemoryThunk() {
|
| process_type == switches::kWorkerProcess ||
|
| (delegate &&
|
| delegate->ProcessRegistersWithSystemProcess(process_type))) {
|
| - base::SystemMonitor::AllocateSystemIOPorts();
|
| + base::PowerMonitor::AllocateSystemIOPorts();
|
| }
|
|
|
| if (!process_type.empty() &&
|
|
|