| Index: ppapi/shared_impl/ppapi_globals.cc
|
| diff --git a/ppapi/shared_impl/ppapi_globals.cc b/ppapi/shared_impl/ppapi_globals.cc
|
| index 80a4ee2417fc8ecb448fde261f411f8284abe73c..0336e0c1c50b3ddb599355dcf3ed0ab6c8d161b7 100644
|
| --- a/ppapi/shared_impl/ppapi_globals.cc
|
| +++ b/ppapi/shared_impl/ppapi_globals.cc
|
| @@ -23,10 +23,12 @@ PpapiGlobals* PpapiGlobals::ppapi_globals_ = NULL;
|
| PpapiGlobals::PpapiGlobals() {
|
| DCHECK(!ppapi_globals_);
|
| ppapi_globals_ = this;
|
| + message_loop_proxy_ = base::MessageLoopProxy::current();
|
| }
|
|
|
| PpapiGlobals::PpapiGlobals(ForTest) {
|
| DCHECK(!ppapi_globals_);
|
| + message_loop_proxy_ = base::MessageLoopProxy::current();
|
| }
|
|
|
| PpapiGlobals::~PpapiGlobals() {
|
| @@ -43,9 +45,7 @@ void PpapiGlobals::SetPpapiGlobalsOnThreadForTest(PpapiGlobals* ptr) {
|
| }
|
|
|
| base::MessageLoopProxy* PpapiGlobals::GetMainThreadMessageLoop() {
|
| - CR_DEFINE_STATIC_LOCAL(scoped_refptr<base::MessageLoopProxy>, proxy,
|
| - (base::MessageLoopProxy::current()));
|
| - return proxy.get();
|
| + return message_loop_proxy_.get();
|
| }
|
|
|
| bool PpapiGlobals::IsHostGlobals() const {
|
|
|