Revert 63600 - Thread IO safety: annotate file_util, and block IO thread from...

base/thread_restrictions.h

Index: base/thread_restrictions.h
===================================================================
--- base/thread_restrictions.h	(revision 63629)
+++ base/thread_restrictions.h	(working copy)
@@ -5,8 +5,6 @@
 #ifndef BASE_THREAD_RESTRICTIONS_H_
 #define BASE_THREAD_RESTRICTIONS_H_
 
-#include "base/basictypes.h"
-
 namespace base {
 
 // ThreadRestrictions helps protect threads that should not block from
@@ -23,43 +21,21 @@
 //
 // ThreadRestrictions does nothing in release builds; it is debug-only.
 //
-// Style tip: where should you put AssertIOAllowed checks?  It's best
-// if you put them as close to the disk access as possible, at the
-// lowest level.  This rule is simple to follow and helps catch all
-// callers.  For example, if your function GoDoSomeBlockingDiskCall()
-// only calls other functions in Chrome and not fopen(), you should go
-// add the AssertIOAllowed checks in the helper functions.
-
 class ThreadRestrictions {
  public:
-  // Constructing a ScopedAllowIO temporarily allows IO for the current
-  // thread.  Doing this is almost certainly always incorrect.  This object
-  // is available to temporarily work around bugs.
-  class ScopedAllowIO {
-   public:
-    ScopedAllowIO() { previous_value_ = SetIOAllowed(true); }
-    ~ScopedAllowIO() { SetIOAllowed(previous_value_); }
-   private:
-    // Whether IO is allowed when the ScopedAllowIO was constructed.
-    bool previous_value_;
 
-    DISALLOW_COPY_AND_ASSIGN(ScopedAllowIO);
-  };
-
 #ifndef NDEBUG
   // Set whether the current thread to make IO calls.
   // Threads start out in the *allowed* state.
-  // Returns the previous value.
-  static bool SetIOAllowed(bool allowed);
+  static void SetIOAllowed(bool allowed);
 
   // Check whether the current thread is allowed to make IO calls,
-  // and DCHECK if not.  See the block comment above the class for
-  // a discussion of where to add these checks.
+  // and DCHECK if not.
   static void AssertIOAllowed();
 #else
   // In Release builds, inline the empty definitions of these functions so
   // that they can be compiled out.
-  static bool SetIOAllowed(bool allowed) { return true; }
+  static void SetIOAllowed(bool allowed) {}
   static void AssertIOAllowed() {}
 #endif