Remving global statics from the headers, so we can split-link.

ppapi/shared_impl/ppapi_globals.h

 // 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.
 
 #ifndef PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_
 #define PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 31 matching lines @@
   // This constructor is to be used only for making a PpapiGlobal for testing
   // purposes. This avoids setting the global static ppapi_globals_. For unit
   // tests that use this feature, the "test" PpapiGlobals should be constructed
   // using this method. See SetPpapiGlobalsOnThreadForTest for more information.
   struct PerThreadForTest {};
   explicit PpapiGlobals(PerThreadForTest);
 
   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
   // return that PpapiGlobals when Get() is called on that thread. Other threads
   // are unaffected. This allows us to have tests which use >1 PpapiGlobals in
   // the same process, e.g. for having 1 thread emulate the "host" and 1 thread
   // emulate the "plugin".
   //
   // PpapiGlobals object must have been constructed using the "PerThreadForTest"
   // parameter.
@@ skipping 61 matching lines @@
 
   virtual bool IsHostGlobals() const;
   virtual bool IsPluginGlobals() const;
 
  private:
   // Return the thread-local pointer which is used only for unit testing. It
   // should always be NULL when running in production. It allows separate
   // threads to have distinct "globals".
   static PpapiGlobals* GetThreadLocalPointer();
 
-  static PpapiGlobals* ppapi_globals_;
-
   scoped_refptr<base::MessageLoopProxy> main_loop_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiGlobals);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_