diff options
author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-03 18:11:10 +0000 |
---|---|---|
committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-03 18:11:10 +0000 |
commit | b8a4cd26b325d109f1b83022042a0f5aa74b4a0f (patch) | |
tree | 6a7ae964e262920b54a8e6006c132a323083f7d0 /base/threading | |
parent | 29e7255c0086b863ecfdb6834a1354089acee2fb (diff) | |
download | chromium_src-b8a4cd26b325d109f1b83022042a0f5aa74b4a0f.zip chromium_src-b8a4cd26b325d109f1b83022042a0f5aa74b4a0f.tar.gz chromium_src-b8a4cd26b325d109f1b83022042a0f5aa74b4a0f.tar.bz2 |
Allow waiting in NestedMessagePumpAndroid.
The default message pump implementation already has this, and
Android's message pump shouldn't be failing on an idle thread that
doesn't allow waiting either. In particular, content_browsertest code
that uses message loops in the teardown phase currently runs into a
failing AssertWaitAllowed() on Android, which this CL fixes.
BUG=None
TEST=Tests still pass.
Review URL: https://chromiumcodereview.appspot.com/23874002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
-rw-r--r-- | base/threading/thread_restrictions.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index 595b970..bc25d6a 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -45,6 +45,7 @@ class BrowserGpuChannelHostFactory; class BrowserTestBase; class GLHelper; class GpuChannelHost; +class NestedMessagePumpAndroid; class RenderWidgetHelper; class ScopedAllowWaitForAndroidLayoutTests; class TextInputClientMac; @@ -176,6 +177,7 @@ class BASE_EXPORT ThreadRestrictions { // DO NOT ADD ANY OTHER FRIEND STATEMENTS, talk to jam or brettw first. // BEGIN ALLOWED USAGE. friend class content::BrowserTestBase; + friend class content::NestedMessagePumpAndroid; friend class content::RenderWidgetHelper; friend class content::ScopedAllowWaitForAndroidLayoutTests; friend class ::HistogramSynchronizer; |