| Index: content/child/child_thread.cc
|
| diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
|
| index 5b54ee041f9b9c0198bdb90a4da2208eee7b8849..2827db437fc0d5b93c7ea2eed0e738092b7dcdc6 100644
|
| --- a/content/child/child_thread.cc
|
| +++ b/content/child/child_thread.cc
|
| @@ -133,10 +133,6 @@ struct CondVarLazyInstanceTraits {
|
| base::LazyInstance<base::ConditionVariable, CondVarLazyInstanceTraits>
|
| g_lazy_child_thread_cv = LAZY_INSTANCE_INITIALIZER;
|
|
|
| -void QuitMainThreadMessageLoop() {
|
| - base::MessageLoop::current()->Quit();
|
| -}
|
| -
|
| #endif
|
|
|
| } // namespace
|
| @@ -449,24 +445,6 @@ ChildThread* ChildThread::current() {
|
| return g_lazy_tls.Pointer()->Get();
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| -// The method must NOT be called on the child thread itself.
|
| -// It may block the child thread if so.
|
| -void ChildThread::ShutdownThread() {
|
| - DCHECK(!ChildThread::current()) <<
|
| - "this method should NOT be called from child thread itself";
|
| - {
|
| - base::AutoLock lock(g_lazy_child_thread_lock.Get());
|
| - while (!g_child_thread)
|
| - g_lazy_child_thread_cv.Get().Wait();
|
| - }
|
| - DCHECK_NE(base::MessageLoop::current(), g_child_thread->message_loop());
|
| - g_child_thread->message_loop()->PostTask(
|
| - FROM_HERE, base::Bind(&QuitMainThreadMessageLoop));
|
| -}
|
| -
|
| -#endif
|
| -
|
| void ChildThread::OnProcessFinalRelease() {
|
| if (on_channel_error_called_) {
|
| base::MessageLoop::current()->Quit();
|
|
|