diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 19:08:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 19:08:58 +0000 |
| commit | 0c65b4e8d0bd6f536633ca7abe21315e88df4bd1 (patch) | |
| tree | a14d81dcbc7d3fad0b11a78580185c80cfc06849 /dbus/bus.cc | |
| parent | 9d64f8f6a7fc5a5e4319b7f047845dee33795172 (diff) | |
| download | chromium_src-0c65b4e8d0bd6f536633ca7abe21315e88df4bd1.zip chromium_src-0c65b4e8d0bd6f536633ca7abe21315e88df4bd1.tar.gz chromium_src-0c65b4e8d0bd6f536633ca7abe21315e88df4bd1.tar.bz2 | |
Add more allow-wait suppressions on cros.
TBR=brettw
Review URL: https://chromiumcodereview.appspot.com/10198034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/bus.cc')
| -rw-r--r-- | dbus/bus.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dbus/bus.cc b/dbus/bus.cc index 6e9209b..6fbb0e7 100644 --- a/dbus/bus.cc +++ b/dbus/bus.cc @@ -368,6 +368,9 @@ void Bus::ShutdownOnDBusThreadAndBlock() { &Bus::ShutdownOnDBusThreadAndBlockInternal, this)); + // http://crbug.com/125222 + base::ThreadRestrictions::ScopedAllowWait allow_wait; + // Wait until the shutdown is complete on the D-Bus thread. // The shutdown should not hang, but set timeout just in case. const int kTimeoutSecs = 3; |