| Index: base/lazy_instance_unittest.cc
|
| diff --git a/base/lazy_instance_unittest.cc b/base/lazy_instance_unittest.cc
|
| index 28bf04ebb4238ba45e294f90e9559beb5e38f6ab..b63e9222910576872cac9634d0a0f58de54889b4 100644
|
| --- a/base/lazy_instance_unittest.cc
|
| +++ b/base/lazy_instance_unittest.cc
|
| @@ -56,8 +56,8 @@ class SlowDelegate : public base::DelegateSimpleThread::Delegate {
|
|
|
| } // namespace
|
|
|
| -static base::LazyInstance<ConstructAndDestructLogger> lazy_logger(
|
| - base::LINKER_INITIALIZED);
|
| +static base::LazyInstance<ConstructAndDestructLogger> lazy_logger =
|
| + LAZY_INSTANCE_INITIALIZER;
|
|
|
| TEST(LazyInstanceTest, Basic) {
|
| {
|
| @@ -78,7 +78,8 @@ TEST(LazyInstanceTest, Basic) {
|
| EXPECT_EQ(4, destructed_seq_.GetNext());
|
| }
|
|
|
| -static base::LazyInstance<SlowConstructor> lazy_slow(base::LINKER_INITIALIZED);
|
| +static base::LazyInstance<SlowConstructor> lazy_slow =
|
| + LAZY_INSTANCE_INITIALIZER;
|
|
|
| TEST(LazyInstanceTest, ConstructorThreadSafety) {
|
| {
|
| @@ -122,7 +123,7 @@ TEST(LazyInstanceTest, LeakyLazyInstance) {
|
| bool deleted1 = false;
|
| {
|
| base::ShadowingAtExitManager shadow;
|
| - static base::LazyInstance<DeleteLogger> test(base::LINKER_INITIALIZED);
|
| + static base::LazyInstance<DeleteLogger> test = LAZY_INSTANCE_INITIALIZER;
|
| test.Get().SetDeletedPtr(&deleted1);
|
| }
|
| EXPECT_TRUE(deleted1);
|
| @@ -134,7 +135,7 @@ TEST(LazyInstanceTest, LeakyLazyInstance) {
|
| base::ShadowingAtExitManager shadow;
|
| static base::LazyInstance<DeleteLogger,
|
| base::LeakyLazyInstanceTraits<DeleteLogger> >
|
| - test(base::LINKER_INITIALIZED);
|
| + test = LAZY_INSTANCE_INITIALIZER;
|
| test.Get().SetDeletedPtr(&deleted2);
|
| }
|
| EXPECT_FALSE(deleted2);
|
|
|