| Index: ppapi/shared_impl/ppapi_globals.cc
|
| diff --git a/ppapi/shared_impl/ppapi_globals.cc b/ppapi/shared_impl/ppapi_globals.cc
|
| index 0fab3dc298390c65135bf8e1e1b7277d99063b7a..c453ae2d4854b86bd3dcd568abbb66d079abd95f 100644
|
| --- a/ppapi/shared_impl/ppapi_globals.cc
|
| +++ b/ppapi/shared_impl/ppapi_globals.cc
|
| @@ -13,10 +13,8 @@ namespace ppapi {
|
| namespace {
|
| // Thread-local globals for testing. See SetPpapiGlobalsOnThreadForTest for more
|
| // information.
|
| -base::LazyInstance<
|
| - base::ThreadLocalPointer<PpapiGlobals>,
|
| - base::LeakyLazyInstanceTraits<base::ThreadLocalPointer<PpapiGlobals> > >
|
| - tls_ppapi_globals_for_test = LAZY_INSTANCE_INITIALIZER;
|
| +base::LazyInstance<base::ThreadLocalPointer<PpapiGlobals> >::Leaky
|
| + tls_ppapi_globals_for_test = LAZY_INSTANCE_INITIALIZER;
|
| } // namespace
|
|
|
| PpapiGlobals* PpapiGlobals::ppapi_globals_ = NULL;
|
|
|