Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Side by Side Diff: base/sequence_checker_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 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/security_unittest.cc ('k') | base/sha1_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/bind.h" 6 #include "base/bind.h"
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/sequence_checker.h" 12 #include "base/sequence_checker.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/test/sequenced_worker_pool_owner.h" 14 #include "base/test/sequenced_worker_pool_owner.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/googletest/include/gtest/gtest.h"
17 17
18 // Duplicated from base/sequence_checker.h so that we can be good citizens 18 // Duplicated from base/sequence_checker.h so that we can be good citizens
19 // there and undef the macro. 19 // there and undef the macro.
20 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) 20 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
21 #define ENABLE_SEQUENCE_CHECKER 1 21 #define ENABLE_SEQUENCE_CHECKER 1
22 #else 22 #else
23 #define ENABLE_SEQUENCE_CHECKER 0 23 #define ENABLE_SEQUENCE_CHECKER 0
24 #endif 24 #endif
25 25
26 namespace base { 26 namespace base {
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 #endif // ENABLE_SEQUENCE_CHECKER 324 #endif // ENABLE_SEQUENCE_CHECKER
325 325
326 #endif // GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER 326 #endif // GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER
327 327
328 } // namespace 328 } // namespace
329 329
330 } // namespace base 330 } // namespace base
331 331
332 // Just in case we ever get lumped together with other compilation units. 332 // Just in case we ever get lumped together with other compilation units.
333 #undef ENABLE_SEQUENCE_CHECKER 333 #undef ENABLE_SEQUENCE_CHECKER
OLDNEW
« no previous file with comments | « base/security_unittest.cc ('k') | base/sha1_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698