diff options
| author | esprehn <esprehn@chromium.org> | 2015-06-18 16:23:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-18 23:23:44 +0000 |
| commit | 84ea651e62a328a46fc01451a043ff5867cf4dea (patch) | |
| tree | 3edc54d616d50dbb159ed56a45e1da4857e44618 /base/threading | |
| parent | 5872904d4899da3da1c8f754092ec421c34c738c (diff) | |
| download | chromium_src-84ea651e62a328a46fc01451a043ff5867cf4dea.zip chromium_src-84ea651e62a328a46fc01451a043ff5867cf4dea.tar.gz chromium_src-84ea651e62a328a46fc01451a043ff5867cf4dea.tar.bz2 | |
Stop crashing in NetworkChangeNotifierMac when running tests.
The Wait() in NetworkChangeNotifierMac causes frequent flaky crashes on
OS X, lets add a ThreadRestrictions::ScopedAllowWait to stop crashing
for now.
BUG=502005
Review URL: https://codereview.chromium.org/1189963007
Cr-Commit-Position: refs/heads/master@{#335159}
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 54f50eb..fc3824e 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -58,6 +58,7 @@ class WatcherThreadManager; } } namespace net { +class NetworkChangeNotifierMac; namespace internal { class AddressTrackerLinux; } @@ -206,6 +207,7 @@ class BASE_EXPORT ThreadRestrictions { friend class disk_cache::BackendImpl; // http://crbug.com/74623 friend class disk_cache::InFlightIO; // http://crbug.com/74623 friend class net::internal::AddressTrackerLinux; // http://crbug.com/125097 + friend class net::NetworkChangeNotifierMac; // http://crbug.com/502005 friend class ::BrowserProcessImpl; // http://crbug.com/125207 friend class ::NativeBackendKWallet; // http://crbug.com/125331 // END USAGE THAT NEEDS TO BE FIXED. |