| 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/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/singleton.h" | 8 #include "base/memory/singleton.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| 11 namespace { | 11 namespace { |
| 12 | 12 |
| 13 COMPILE_ASSERT(DefaultSingletonTraits<int>::kRegisterAtExit == true, a); | 13 COMPILE_ASSERT(DefaultSingletonTraits<int>::kRegisterAtExit == true, a); |
| 14 | 14 |
| 15 typedef void (*CallbackFunc)(); | 15 typedef void (*CallbackFunc)(); |
| 16 | 16 |
| 17 class IntSingleton { | 17 class IntSingleton { |
| 18 public: | 18 public: |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 { | 247 { |
| 248 // Resurrect the static singleton, and assert that it | 248 // Resurrect the static singleton, and assert that it |
| 249 // still points to the same (static) memory. | 249 // still points to the same (static) memory. |
| 250 CallbackSingletonWithStaticTrait::Trait::Resurrect(); | 250 CallbackSingletonWithStaticTrait::Trait::Resurrect(); |
| 251 EXPECT_EQ(GetStaticSingleton(), static_singleton); | 251 EXPECT_EQ(GetStaticSingleton(), static_singleton); |
| 252 } | 252 } |
| 253 } | 253 } |
| 254 // The leaky singleton shouldn't leak since SingletonLeak has not been called. | 254 // The leaky singleton shouldn't leak since SingletonLeak has not been called. |
| 255 VerifiesCallbacksNotCalled(); | 255 VerifiesCallbacksNotCalled(); |
| 256 } | 256 } |
| OLD | NEW |