base/threading/non_thread_safe_unittest.cc - Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: base/threading/non_thread_safe_unittest.cc

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « base/test/values_test_util.cc ('k') | base/threading/platform_thread_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/logging.h"	6 #include "base/logging.h"

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "base/threading/non_thread_safe.h"	8 #include "base/threading/non_thread_safe.h"

9 #include "base/threading/simple_thread.h"	9 #include "base/threading/simple_thread.h"

10 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/googletest/include/gtest/gtest.h"

11	11

12 // Duplicated from base/threading/non_thread_safe.h so that we can be	12 // Duplicated from base/threading/non_thread_safe.h so that we can be

13 // good citizens there and undef the macro.	13 // good citizens there and undef the macro.

14 #if (!defined(NDEBUG) \|\| defined(DCHECK_ALWAYS_ON))	14 #if (!defined(NDEBUG) \|\| defined(DCHECK_ALWAYS_ON))

15 #define ENABLE_NON_THREAD_SAFE 1	15 #define ENABLE_NON_THREAD_SAFE 1

16 #else	16 #else

17 #define ENABLE_NON_THREAD_SAFE 0	17 #define ENABLE_NON_THREAD_SAFE 0

18 #endif	18 #endif

19	19

20 namespace base {	20 namespace base {

(...skipping 133 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
154 NonThreadSafeClass::DestructorOnDifferentThreadImpl();	154 NonThreadSafeClass::DestructorOnDifferentThreadImpl();

155 }	155 }

156 #endif // ENABLE_NON_THREAD_SAFE	156 #endif // ENABLE_NON_THREAD_SAFE

157	157

158 #endif // GTEST_HAS_DEATH_TEST \|\| !ENABLE_NON_THREAD_SAFE	158 #endif // GTEST_HAS_DEATH_TEST \|\| !ENABLE_NON_THREAD_SAFE

159	159

160 // Just in case we ever get lumped together with other compilation units.	160 // Just in case we ever get lumped together with other compilation units.

161 #undef ENABLE_NON_THREAD_SAFE	161 #undef ENABLE_NON_THREAD_SAFE

162	162

163 } // namespace base	163 } // namespace base

OLD	NEW