diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /base/non_thread_safe.cc | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'base/non_thread_safe.cc')
| -rw-r--r-- | base/non_thread_safe.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/base/non_thread_safe.cc b/base/non_thread_safe.cc index d8a91c6..6889101 100644 --- a/base/non_thread_safe.cc +++ b/base/non_thread_safe.cc @@ -1,4 +1,4 @@ -// 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. @@ -9,12 +9,8 @@ #include "base/logging.h" -NonThreadSafe::NonThreadSafe() - : valid_thread_id_(PlatformThread::CurrentId()) { -} - bool NonThreadSafe::CalledOnValidThread() const { - return valid_thread_id_ == PlatformThread::CurrentId(); + return thread_checker_.CalledOnValidThread(); } NonThreadSafe::~NonThreadSafe() { |