Fix thread_restrictions ifdef

base/threading/thread_restrictions.h

 // 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.
 
 #ifndef BASE_THREADING_THREAD_RESTRICTIONS_H_
 #define BASE_THREADING_THREAD_RESTRICTIONS_H_
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 
@@ skipping 102 matching lines @@
     ScopedAllowSingleton() { previous_value_ = SetSingletonAllowed(true); }
     ~ScopedAllowSingleton() { SetSingletonAllowed(previous_value_); }
    private:
     // Whether singleton use is allowed when the ScopedAllowSingleton was
     // constructed.
     bool previous_value_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedAllowSingleton);
   };
 
-#if defined(ENABLE_THREAD_RESTRICTIONS)
+#if ENABLE_THREAD_RESTRICTIONS
   // 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);
 
   // 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.
   static void AssertIOAllowed();
 
@@ skipping 51 matching lines @@
   friend class net::FileStreamWin;                // http://crbug.com/115067
   friend class net::NetworkManagerApi;            // http://crbug.com/125097
   friend class ::AcceleratedPresenter;            // http://crbug.com/125391
   friend class ::BrowserProcessImpl;              // http://crbug.com/125207
   friend class ::GpuChannelHost;                  // http://crbug.com/125264
   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(ENABLE_THREAD_RESTRICTIONS)
+#if ENABLE_THREAD_RESTRICTIONS
   static bool SetWaitAllowed(bool allowed);
 #else
   static bool SetWaitAllowed(bool allowed) { return true; }
 #endif
 
   // Constructing a ScopedAllowWait temporarily allows waiting on the current
   // thread.  Doing this is almost always incorrect, which is why we limit who
   // can use this through friend. If you find yourself needing to use this, find
   // another way. Talk to jam or brettw.
   class BASE_EXPORT ScopedAllowWait {
    public:
     ScopedAllowWait() { previous_value_ = SetWaitAllowed(true); }
     ~ScopedAllowWait() { SetWaitAllowed(previous_value_); }
    private:
     // Whether singleton use is allowed when the ScopedAllowWait was
     // constructed.
     bool previous_value_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait);
   };
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions);
 };
 

[Ryan Sleevi, 2012/06/26 19:18:31]

missing #undef

[jam, 2012/06/26 19:32:51]

they're all matched...

[Ryan Sleevi, 2012/06/26 20:26:14]

not #endif, #undef.

You #define ENABLE_THREAD_RESTRICTIONS on line 13/15, but it's never #undef'd in
the header, leaving it floating around.

[jabdelmalek, 2012/06/26 20:28:56]

ah, I misunderstood.

apart from being harmless, it's also used in the cc file

 }  // namespace base
 
 #endif  // BASE_THREADING_THREAD_RESTRICTIONS_H_