| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 440925423d8b91535d5f3e3bb73ff9d05a6fc95f..313561c7e6ccbf975373a013f3ddbce92c49225c 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -102,11 +102,6 @@
|
| #include "ui/base/l10n/l10n_util_win.h"
|
| #endif
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "base/chromeos/memory_pressure_observer_chromeos.h"
|
| -#include "chromeos/chromeos_switches.h"
|
| -#endif
|
| -
|
| #if defined(USE_GLIB)
|
| #include <glib-object.h>
|
| #endif
|
| @@ -588,13 +583,6 @@ int BrowserMainLoop::PreCreateThreads() {
|
| result_code_ = parts_->PreCreateThreads();
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| - if (chromeos::switches::MemoryPressureHandlingEnabled()) {
|
| - memory_pressure_observer_.reset(new base::MemoryPressureObserverChromeOS(
|
| - chromeos::switches::GetMemoryPressureThresholds()));
|
| - }
|
| -#endif
|
| -
|
| #if defined(ENABLE_PLUGINS)
|
| // Prior to any processing happening on the io thread, we create the
|
| // plugin service as it is predominantly used from the io thread,
|
| @@ -851,10 +839,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
|
| resource_dispatcher_host_.get()->Shutdown();
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| - memory_pressure_observer_.reset();
|
| -#endif
|
| -
|
| #if defined(OS_MACOSX)
|
| BrowserCompositorMac::DisableRecyclingForShutdown();
|
| #endif
|
|
|