| OLD | NEW | 
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/thread.h" | 5 #include "base/thread.h" | 
| 6 | 6 | 
| 7 #include <vector> | 7 #include <vector> | 
| 8 | 8 | 
| 9 #include "base/lock.h" |  | 
| 10 #include "base/message_loop.h" | 9 #include "base/message_loop.h" | 
| 11 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" | 10 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" | 
| 12 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" | 
| 13 #include "testing/platform_test.h" | 12 #include "testing/platform_test.h" | 
| 14 | 13 | 
| 15 using base::Thread; | 14 using base::Thread; | 
| 16 | 15 | 
| 17 typedef PlatformTest ThreadTest; | 16 typedef PlatformTest ThreadTest; | 
| 18 | 17 | 
| 19 namespace { | 18 namespace { | 
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 252     // Upon leaving this scope, the thread is deleted. | 251     // Upon leaving this scope, the thread is deleted. | 
| 253   } | 252   } | 
| 254 | 253 | 
| 255   // Check the order of events during shutdown. | 254   // Check the order of events during shutdown. | 
| 256   ASSERT_EQ(4u, captured_events.size()); | 255   ASSERT_EQ(4u, captured_events.size()); | 
| 257   EXPECT_EQ(THREAD_EVENT_INIT, captured_events[0]); | 256   EXPECT_EQ(THREAD_EVENT_INIT, captured_events[0]); | 
| 258   EXPECT_EQ(THREAD_EVENT_CLEANUP, captured_events[1]); | 257   EXPECT_EQ(THREAD_EVENT_CLEANUP, captured_events[1]); | 
| 259   EXPECT_EQ(THREAD_EVENT_MESSAGE_LOOP_DESTROYED, captured_events[2]); | 258   EXPECT_EQ(THREAD_EVENT_MESSAGE_LOOP_DESTROYED, captured_events[2]); | 
| 260   EXPECT_EQ(THREAD_EVENT_CLEANUP_AFTER_LOOP, captured_events[3]); | 259   EXPECT_EQ(THREAD_EVENT_CLEANUP_AFTER_LOOP, captured_events[3]); | 
| 261 } | 260 } | 
| OLD | NEW | 
|---|