| Index: ppapi/shared_impl/ppapi_globals.h
|
| diff --git a/ppapi/shared_impl/ppapi_globals.h b/ppapi/shared_impl/ppapi_globals.h
|
| index d226c7f8530e8cf0bdd0aac85bc2d852a904c278..4c094c16396e4177f00d3fa56719cc6eb75d3e6b 100644
|
| --- a/ppapi/shared_impl/ppapi_globals.h
|
| +++ b/ppapi/shared_impl/ppapi_globals.h
|
| @@ -49,13 +49,7 @@ class PPAPI_SHARED_EXPORT PpapiGlobals {
|
| virtual ~PpapiGlobals();
|
|
|
| // Getter for the global singleton.
|
| - inline static PpapiGlobals* Get() {
|
| - if (ppapi_globals_)
|
| - return ppapi_globals_;
|
| - // In unit tests, the following might be valid (see
|
| - // SetPpapiGlobalsOnThreadForTest). Normally, this will just return NULL.
|
| - return GetThreadLocalPointer();
|
| - }
|
| + static PpapiGlobals* Get();
|
|
|
| // This allows us to set a given PpapiGlobals object as the PpapiGlobals for
|
| // a given thread. After setting the PpapiGlobals for a thread, Get() will
|
| @@ -137,8 +131,6 @@ class PPAPI_SHARED_EXPORT PpapiGlobals {
|
| // threads to have distinct "globals".
|
| static PpapiGlobals* GetThreadLocalPointer();
|
|
|
| - static PpapiGlobals* ppapi_globals_;
|
| -
|
| scoped_refptr<base::MessageLoopProxy> main_loop_proxy_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PpapiGlobals);
|
|
|