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

2 files changed, 21 insertions, 16 deletions

diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 9b79587..8a494a8 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -10,10 +10,10 @@
 
 class BrowserProcessImpl;
 class MetricsService;
+class NativeBackendKWallet;
 class RenderWidgetHelper;
 class TestingAutomationProvider;
 class TextInputClientMac;
-class NativeBackendKWallet;
 
 namespace browser_sync {
 class NonFrontendDataTypeController;
@@ -21,6 +21,7 @@ class UIModelWorker;
 }
 namespace chromeos {
 class AudioMixerAlsa;
+class BlockingMethodCaller;
 }
 namespace chrome_browser_net {
 class Predictor;
@@ -155,22 +156,23 @@ 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 ::chromeos::AudioMixerAlsa;        // http://crbug.com/125206
+  friend class ::chromeos::BlockingMethodCaller;  // http://crbug.com/125360
   friend class browser_sync::NonFrontendDataTypeController;  // http://crbug.com/19757
-  friend class browser_sync::UIModelWorker;    // http://crbug.com/19757
-  friend class chrome_browser_net::Predictor;  // http://crbug.com/78451
-  friend class dbus::Bus;                      // http://crbug.com/125222
-  friend class disk_cache::BackendImpl;        // http://crbug.com/74623
-  friend class disk_cache::InFlightIO;         // http://crbug.com/74623
-  friend class gdata::GDataFileSystem;         // http://crbug.com/125220
-  friend class media::AudioOutputController;   // http://crbug.com/120973
-  friend class net::FileStreamPosix;           // http://crbug.com/115067
-  friend class net::FileStreamWin;             // http://crbug.com/115067
-  friend class net::NetworkManagerApi;         // http://crbug.com/125097
-  friend class ::BrowserProcessImpl;           // http://crbug.com/125207
-  friend class ::MetricsService;               // http://crbug.com/124954
-  friend class ::TextInputClientMac;           // http://crbug.com/121917
-  friend class ::NativeBackendKWallet;         // http://crbug.com/125331
+  friend class browser_sync::UIModelWorker;       // http://crbug.com/19757
+  friend class chrome_browser_net::Predictor;     // http://crbug.com/78451
+  friend class dbus::Bus;                         // http://crbug.com/125222
+  friend class disk_cache::BackendImpl;           // http://crbug.com/74623
+  friend class disk_cache::InFlightIO;            // http://crbug.com/74623
+  friend class gdata::GDataFileSystem;            // http://crbug.com/125220
+  friend class media::AudioOutputController;      // http://crbug.com/120973
+  friend class net::FileStreamPosix;              // http://crbug.com/115067
+  friend class net::FileStreamWin;                // http://crbug.com/115067
+  friend class net::NetworkManagerApi;            // http://crbug.com/125097
+  friend class ::BrowserProcessImpl;              // http://crbug.com/125207
+  friend class ::MetricsService;                  // http://crbug.com/124954
+  friend class ::TextInputClientMac;              // http://crbug.com/121917
+  friend class ::NativeBackendKWallet;            // http://crbug.com/125331
   // END USAGE THAT NEEDS TO BE FIXED.
 
 #if !defined(OFFICIAL_BUILD)
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;
 }