diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 18:03:58 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 18:03:58 +0000 |
commit | 79a75b0cad4046bcb04a7a61ae465093f869b35f (patch) | |
tree | 54488ddbd2982b3a3b00e782c53896ca268f045d /base | |
parent | 067e3036fe25c792b5dd643c4a733a620be9537f (diff) | |
download | chromium_src-79a75b0cad4046bcb04a7a61ae465093f869b35f.zip chromium_src-79a75b0cad4046bcb04a7a61ae465093f869b35f.tar.gz chromium_src-79a75b0cad4046bcb04a7a61ae465093f869b35f.tar.bz2 |
Fix ChromeOS debug asserts after adding thread restrictions on blocking the UI/IO threads.
TBR=brettw
Review URL: https://chromiumcodereview.appspot.com/10230007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/threading/thread_restrictions.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index f638cb3..54e2e3d 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -8,10 +8,14 @@ #include "base/base_export.h" #include "base/basictypes.h" +class BrowserProcessImpl; class MetricsService; class RenderWidgetHelper; class TestingAutomationProvider; class TextInputClientMac; +namespace chromeos { +class AudioMixerAlsa; +} namespace chrome_browser_net { class Predictor; } @@ -137,6 +141,7 @@ class BASE_EXPORT ThreadRestrictions { friend class ThreadTestHelper; // END ALLOWED USAGE. // BEGIN USAGE THAT NEEDS TO BE FIXED. + friend class chromeos::AudioMixerAlsa; // http://crbug.com/125206 friend class chrome_browser_net::Predictor; // http://crbug.com/78451 friend class disk_cache::BackendImpl; // http://crbug.com/74623 friend class disk_cache::InFlightIO; // http://crbug.com/74623 @@ -144,8 +149,9 @@ class BASE_EXPORT ThreadRestrictions { friend class net::FileStreamPosix; // http://crbug.com/74623 friend class net::FileStreamWin; // http://crbug.com/74623 friend class net::NetworkManagerApi; // http://crbug.com/125097 - friend class ::TextInputClientMac; // http://crbug.com/121917 + friend class ::BrowserProcessImpl; // http://crbug.com/125207 friend class ::MetricsService; // http://crbug.com/124954 + friend class ::TextInputClientMac; // http://crbug.com/121917 // END USAGE THAT NEEDS TO BE FIXED. #ifndef NDEBUG |