summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/blocking_method_caller.cc3
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;
}