Fix unit test to allow repeated successful runs by avoiding a function static variable in tests.

ppapi/shared_impl/ppapi_globals.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/shared_impl/ppapi_globals.h"
 
 #include "base/lazy_instance.h"  // For testing purposes only.
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread_local.h"  // For testing purposes only.
@@ skipping 25 matching lines @@
 
 // static
 void PpapiGlobals::SetPpapiGlobalsOnThreadForTest(PpapiGlobals* ptr) {
   // If we're using a per-thread PpapiGlobals, we should not have a global one.
   // If we allowed it, it would always over-ride the "test" versions.
   DCHECK(!ppapi_globals_);
   tls_ppapi_globals_for_test.Pointer()->Set(ptr);
 }
 
 base::MessageLoopProxy* PpapiGlobals::GetMainThreadMessageLoop() {
-  CR_DEFINE_STATIC_LOCAL(scoped_refptr<base::MessageLoopProxy>, proxy,
-      (base::MessageLoopProxy::current()));
-  return proxy.get();
+  if (!message_loop_proxy_.get())
+    message_loop_proxy_ = base::MessageLoopProxy::current();

[brettw, 2012/07/13 16:36:22]

I think you should just set this in the constructor rather than trying to do it
lazily here.

[dmichael (off chromium), 2012/07/13 16:44:58]

Agree. The important thing is that base::MessageLoopProxy::current is called on
the main thread. Doing it in the constructor will do that nicely. And then we
can probably get rid of a "special" call to GetMainThreadMessageLoop:
http://code.google.com/searchframe#OAMlx_jo-ck/src/webkit/plugins/ppapi/plugi...

+  return message_loop_proxy_.get();
 }
 
 bool PpapiGlobals::IsHostGlobals() const {
   return false;
 }
 
 bool PpapiGlobals::IsPluginGlobals() const {
   return false;
 }
 
 // static
 PpapiGlobals* PpapiGlobals::GetThreadLocalPointer() {
   return tls_ppapi_globals_for_test.Pointer()->Get();
 }
 
 }  // namespace ppapi