| Index: mojo/edk/system/core_test_base.cc
|
| diff --git a/mojo/edk/system/core_test_base.cc b/mojo/edk/system/core_test_base.cc
|
| index bfdcb1bcc39e26e2eae1e2b54321414640255781..eec00f0ded31eb507da911d27b79d2e00de8e757 100644
|
| --- a/mojo/edk/system/core_test_base.cc
|
| +++ b/mojo/edk/system/core_test_base.cc
|
| @@ -215,167 +215,167 @@ CoreTestBase_MockHandleInfo::~CoreTestBase_MockHandleInfo() {
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetCtorCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return ctor_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetDtorCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return dtor_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetCloseCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return close_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetWriteMessageCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return write_message_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetReadMessageCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return read_message_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetWriteDataCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return write_data_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetBeginWriteDataCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return begin_write_data_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetEndWriteDataCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return end_write_data_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetReadDataCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return read_data_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetBeginReadDataCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return begin_read_data_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetEndReadDataCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return end_read_data_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetAddAwakableCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return add_awakable_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetRemoveAwakableCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return remove_awakable_call_count_;
|
| }
|
|
|
| unsigned CoreTestBase_MockHandleInfo::GetCancelAllAwakablesCallCount() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return cancel_all_awakables_call_count_;
|
| }
|
|
|
| size_t CoreTestBase_MockHandleInfo::GetAddedAwakableSize() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return added_awakables_.size();
|
| }
|
|
|
| Awakable* CoreTestBase_MockHandleInfo::GetAddedAwakableAt(unsigned i) const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return added_awakables_[i];
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementCtorCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| ctor_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementDtorCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| dtor_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementCloseCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| close_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementWriteMessageCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| write_message_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementReadMessageCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| read_message_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementWriteDataCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| write_data_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementBeginWriteDataCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| begin_write_data_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementEndWriteDataCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| end_write_data_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementReadDataCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| read_data_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementBeginReadDataCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| begin_read_data_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementEndReadDataCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| end_read_data_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementAddAwakableCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| add_awakable_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementRemoveAwakableCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| remove_awakable_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::IncrementCancelAllAwakablesCallCount() {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| cancel_all_awakables_call_count_++;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::AllowAddAwakable(bool alllow) {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| add_awakable_allowed_ = alllow;
|
| }
|
|
|
| bool CoreTestBase_MockHandleInfo::IsAddAwakableAllowed() const {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| return add_awakable_allowed_;
|
| }
|
|
|
| void CoreTestBase_MockHandleInfo::AwakableWasAdded(Awakable* awakable) {
|
| - base::AutoLock locker(lock_);
|
| + MutexLocker locker(&mutex_);
|
| added_awakables_.push_back(awakable);
|
| }
|
|
|
|
|