Add more allow-wait suppressions on cros.

chrome/browser/chromeos/gdata/gdata_file_system.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 
 #include <errno.h>
 #include <sys/stat.h>
 
 #include <set>
@@ skipping 914 matching lines @@
 
 GDataFileSystem::~GDataFileSystem() {
   // This should be called from UI thread, from GDataSystemService shutdown.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   pref_registrar_.reset(NULL);
 
   // ui_weak_ptr_factory_ must be deleted on UI thread.
   ui_weak_ptr_factory_.reset();
 
-  // We should wait if there is any pending tasks posted to the worker
-  // thread pool. on_io_completed_ won't be signaled iff |num_pending_tasks_|
-  // is greater that 0.
-  // We don't have to lock with |num_pending_tasks_lock_| here, since number of
-  // pending tasks can only decrease at this point (Number of pending class can
-  // be increased only on UI and IO thread. We are on UI thread, and there will
-  // be no more tasks run on IO thread.
-  on_io_completed_->Wait();
+  {
+    // http://crbug.com/125220
+    base::ThreadRestrictions::ScopedAllowWait allow_wait;
+    // We should wait if there is any pending tasks posted to the worker
+    // thread pool. on_io_completed_ won't be signaled iff |num_pending_tasks_|
+    // is greater that 0.
+    // We don't have to lock with |num_pending_tasks_lock_| here, since number
+    // of pending tasks can only decrease at this point (Number of pending class
+    // can be increased only on UI and IO thread. We are on UI thread, and there
+    // will be no more tasks run on IO thread.
+    on_io_completed_->Wait();
+  }
 
   // Now that we are sure that there are no more pending tasks bound to this on
   // other threads, we are safe to destroy the data members.
 
   // Cancel all the in-flight operations.
   // This asynchronously cancels the URL fetch operations.
   documents_service_->CancelAll();
   documents_service_.reset();
 
   // Lock to let root destroy cache map and resource map.
@@ skipping 3630 matching lines @@
   pref_registrar_->Init(profile_->GetPrefs());
   pref_registrar_->Add(prefs::kDisableGDataHostedFiles, this);
 }
 
 void SetFreeDiskSpaceGetterForTesting(FreeDiskSpaceGetterInterface* getter) {
   delete global_free_disk_getter_for_testing;  // Safe to delete NULL;
   global_free_disk_getter_for_testing = getter;
 }
 
 }  // namespace gdata