| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/non_thread_safe.h" | 7 #include "base/non_thread_safe.h" |
| 8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
| 9 #include "base/simple_thread.h" | 9 #include "base/threading/simple_thread.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 11 | 11 |
| 12 #ifndef NDEBUG | 12 #ifndef NDEBUG |
| 13 | 13 |
| 14 // Simple class to exersice the basics of NonThreadSafe. | 14 // Simple class to exersice the basics of NonThreadSafe. |
| 15 // Both the destructor and DoStuff should verify that they were | 15 // Both the destructor and DoStuff should verify that they were |
| 16 // called on the same thread as the constructor. | 16 // called on the same thread as the constructor. |
| 17 class NonThreadSafeClass : public NonThreadSafe { | 17 class NonThreadSafeClass : public NonThreadSafe { |
| 18 public: | 18 public: |
| 19 NonThreadSafeClass() {} | 19 NonThreadSafeClass() {} |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 non_thread_safe_class.release()); | 117 non_thread_safe_class.release()); |
| 118 | 118 |
| 119 delete_on_thread.Start(); | 119 delete_on_thread.Start(); |
| 120 delete_on_thread.Join(); | 120 delete_on_thread.Join(); |
| 121 }, ""); | 121 }, ""); |
| 122 } | 122 } |
| 123 | 123 |
| 124 #endif // GTEST_HAS_DEATH_TEST | 124 #endif // GTEST_HAS_DEATH_TEST |
| 125 | 125 |
| 126 #endif // NDEBUG | 126 #endif // NDEBUG |
| OLD | NEW |