Index: trunk/src/base/memory/weak_ptr.h |
=================================================================== |
--- trunk/src/base/memory/weak_ptr.h (revision 213937) |
+++ trunk/src/base/memory/weak_ptr.h (working copy) |
@@ -67,8 +67,8 @@ |
#include "base/base_export.h" |
#include "base/logging.h" |
#include "base/memory/ref_counted.h" |
-#include "base/sequence_checker.h" |
#include "base/template_util.h" |
+#include "base/threading/thread_checker.h" |
namespace base { |
@@ -91,14 +91,14 @@ |
bool IsValid() const; |
// Remove this when crbug.com/234964 is addressed. |
- void DetachFromThreadHack() { sequence_checker_.DetachFromSequence(); } |
+ void DetachFromThreadHack() { thread_checker_.DetachFromThread(); } |
private: |
friend class base::RefCountedThreadSafe<Flag>; |
~Flag(); |
- SequenceChecker sequence_checker_; |
+ ThreadChecker thread_checker_; |
bool is_valid_; |
}; |