Commit 52fd5e5c authored by Simeon Anfinrud's avatar Simeon Anfinrud Committed by Commit Bot

[content] Remove Android debugging CHECKs in render thread.

These asserts are no longer actively being used for debugging.

When this is compiled on the Android component build, the linker
cannot find the extern bool declared by another shared library.
This patch disables the InProcessRenderThread checks, which were
intended for debugging in production, so that developers can at
least attempt to use the component build on Android.

Bug: Internal b/64440217
Bug: 514141
Test: chromecast internal Android component build
Change-Id: Iac24c87867e218f98c130677e6baff9142a7fe84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1898812Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Commit-Queue: Simeon Anfinrud <sanfin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714138}
parent 636d9ea4
...@@ -515,7 +515,6 @@ class HDRProxy { ...@@ -515,7 +515,6 @@ class HDRProxy {
BrowserMainLoop* g_current_browser_main_loop = nullptr; BrowserMainLoop* g_current_browser_main_loop = nullptr;
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
bool g_browser_main_loop_shutting_down = false;
namespace { namespace {
// Whether or not BrowserMainLoop::CreateStartupTasks() posts any tasks. // Whether or not BrowserMainLoop::CreateStartupTasks() posts any tasks.
...@@ -1091,10 +1090,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { ...@@ -1091,10 +1090,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
base::BindOnce( base::BindOnce(
base::IgnoreResult(&base::ThreadRestrictions::SetWaitAllowed), true)); base::IgnoreResult(&base::ThreadRestrictions::SetWaitAllowed), true));
#if defined(OS_ANDROID)
g_browser_main_loop_shutting_down = true;
#endif
if (RenderProcessHost::run_renderer_in_process()) if (RenderProcessHost::run_renderer_in_process())
RenderProcessHostImpl::ShutDownInProcessRenderer(); RenderProcessHostImpl::ShutDownInProcessRenderer();
......
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
namespace content { namespace content {
#if defined(OS_ANDROID)
extern bool g_browser_main_loop_shutting_down;
#endif
InProcessRendererThread::InProcessRendererThread( InProcessRendererThread::InProcessRendererThread(
const InProcessChildThreadParams& params, const InProcessChildThreadParams& params,
int32_t renderer_client_id) int32_t renderer_client_id)
...@@ -28,13 +24,6 @@ InProcessRendererThread::InProcessRendererThread( ...@@ -28,13 +24,6 @@ InProcessRendererThread::InProcessRendererThread(
renderer_client_id_(renderer_client_id) {} renderer_client_id_(renderer_client_id) {}
InProcessRendererThread::~InProcessRendererThread() { InProcessRendererThread::~InProcessRendererThread() {
#if defined(OS_ANDROID)
// Don't allow the render thread to be shut down in single process mode on
// Android unless the browser is shutting down.
// Temporary CHECK() to debug http://crbug.com/514141
CHECK(g_browser_main_loop_shutting_down);
#endif
Stop(); Stop();
} }
...@@ -61,13 +50,6 @@ void InProcessRendererThread::Init() { ...@@ -61,13 +50,6 @@ void InProcessRendererThread::Init() {
} }
void InProcessRendererThread::CleanUp() { void InProcessRendererThread::CleanUp() {
#if defined(OS_ANDROID)
// Don't allow the render thread to be shut down in single process mode on
// Android unless the browser is shutting down.
// Temporary CHECK() to debug http://crbug.com/514141
CHECK(g_browser_main_loop_shutting_down);
#endif
render_process_.reset(); render_process_.reset();
// It's a little lame to manually set this flag. But the single process // It's a little lame to manually set this flag. But the single process
......
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