Sometimes you want to enforce that some but not all of your methods are called on the same thread as the constructor. ThreadChecker allows you to do this.

BUG=38475
TEST=base_unittests --gtest_filter=NonThreadSafeTest.* and base_unittests --gtest_filter=ThreadChecker.*

Review URL: http://codereview.chromium.org/3148032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57140 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 9 deletions

diff --git a/base/non_thread_safe.h b/base/non_thread_safe.h
index feb5120..e435884 100644
--- a/base/non_thread_safe.h
+++ b/base/non_thread_safe.h
@@ -1,12 +1,13 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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_NON_THREAD_SAFE_H__
-#define BASE_NON_THREAD_SAFE_H__
+#ifndef BASE_NON_THREAD_SAFE_H_
+#define BASE_NON_THREAD_SAFE_H_
 #pragma once
 
 #include "base/platform_thread.h"
+#include "base/thread_checker.h"
 
 // A helper class used to help verify that methods of a class are
 // called from the same thread.  One can inherit from this class and use
@@ -29,25 +30,21 @@
 #ifndef NDEBUG
 class NonThreadSafe {
  public:
-  NonThreadSafe();
   ~NonThreadSafe();
 
   bool CalledOnValidThread() const;
 
  private:
-  PlatformThreadId valid_thread_id_;
+  ThreadChecker thread_checker_;
 };
 #else
 // Do nothing in release mode.
 class NonThreadSafe {
  public:
-  NonThreadSafe() {}
-  ~NonThreadSafe() {}
-
   bool CalledOnValidThread() const {
     return true;
   }
 };
 #endif  // NDEBUG
 
-#endif  // BASE_NON_THREAD_SAFE_H__
+#endif  // BASE_NON_THREAD_SAFE_H_