| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 9980d2e09b6f3e47719dfc82cec2bf4fa29e6e81..616f523ec8163d93ce5f66d319954dd2c003359e 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -401,6 +401,10 @@ base::win::MemoryPressureMonitor* CreateWinMemoryPressureMonitor(
|
| // The currently-running BrowserMainLoop. There can be one or zero.
|
| BrowserMainLoop* g_current_browser_main_loop = NULL;
|
|
|
| +#if defined(OS_ANDROID)
|
| +bool g_browser_main_loop_shutting_down = false;
|
| +#endif
|
| +
|
| // For measuring memory usage after each task. Behind a command line flag.
|
| class BrowserMainLoop::MemoryObserver : public base::MessageLoop::TaskObserver {
|
| public:
|
| @@ -988,6 +992,10 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
|
| base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed),
|
| true));
|
|
|
| +#if defined(OS_ANDROID)
|
| + g_browser_main_loop_shutting_down = true;
|
| +#endif
|
| +
|
| if (RenderProcessHost::run_renderer_in_process())
|
| RenderProcessHostImpl::ShutDownInProcessRenderer();
|
|
|
|
|