summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 02:41:37 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 02:41:37 +0000
commitd5861b816aa638e9ce9473e7af55c6a38f8f7f55 (patch)
tree7e4bcd7b45b155fa2c96ca4b1b28e1982c6a94b7 /base
parentc5196354466d32b04527c4969df70d147035f4b0 (diff)
downloadchromium_src-d5861b816aa638e9ce9473e7af55c6a38f8f7f55.zip
chromium_src-d5861b816aa638e9ce9473e7af55c6a38f8f7f55.tar.gz
chromium_src-d5861b816aa638e9ce9473e7af55c6a38f8f7f55.tar.bz2
Remove gdata::GDataFileSystem from ScopedAllowedWait's user list
BUG=126838 TEST=build success Review URL: https://chromiumcodereview.appspot.com/10569002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/threading/thread_restrictions.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index f0a736d..d2932c7 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -43,9 +43,6 @@ namespace disk_cache {
class BackendImpl;
class InFlightIO;
}
-namespace gdata {
-class GDataFileSystem;
-}
namespace media {
class AudioOutputController;
}
@@ -159,7 +156,7 @@ class BASE_EXPORT ThreadRestrictions {
// DO NOT ADD ANY OTHER FRIEND STATEMENTS, talk to jam or brettw first.
// BEGIN ALLOWED USAGE.
friend class ::HistogramSynchronizer;
- friend class ::RenderWidgetHelper;
+ friend class ::RenderWidgetHelper;
friend class ::TestingAutomationProvider;
friend class SequencedWorkerPool;
friend class SimpleThread;
@@ -179,7 +176,6 @@ class BASE_EXPORT ThreadRestrictions {
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