diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 16:42:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 16:42:17 +0000 |
| commit | 8e99d24b246f33008d2db7a8e06c91a9bc23745d (patch) | |
| tree | 78846e6fd27ccb660deab482c9d30efd43c5c2e3 /chromeos | |
| parent | 102654282860370f2abe61dbb08c8333d5e18cf1 (diff) | |
| download | chromium_src-8e99d24b246f33008d2db7a8e06c91a9bc23745d.zip chromium_src-8e99d24b246f33008d2db7a8e06c91a9bc23745d.tar.gz chromium_src-8e99d24b246f33008d2db7a8e06c91a9bc23745d.tar.bz2 | |
Add a suppression on ChromeOS for allowing wait.
BUG=30124,125360
TBR=hashimoto
Review URL: https://chromiumcodereview.appspot.com/10243007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/dbus/blocking_method_caller.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromeos/dbus/blocking_method_caller.cc b/chromeos/dbus/blocking_method_caller.cc index 182f0cf..4485c52 100644 --- a/chromeos/dbus/blocking_method_caller.cc +++ b/chromeos/dbus/blocking_method_caller.cc @@ -5,6 +5,7 @@ #include "chromeos/dbus/blocking_method_caller.h" #include "base/bind.h" +#include "base/threading/thread_restrictions.h" #include "dbus/bus.h" #include "dbus/object_proxy.h" @@ -60,6 +61,8 @@ dbus::Response* BlockingMethodCaller::CallMethodAndBlock( base::Owned(signaler), base::Unretained(proxy_), method_call)); + // http://crbug.com/125360 + base::ThreadRestrictions::ScopedAllowWait allow_wait; on_blocking_method_call_.Wait(); return response; } |