Add a new GetInstance() method for singleton classes, take 2.

webkit/glue/plugins/pepper_resource_tracker.h

 // Copyright (c) 2010 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 WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_TRACKER_H_
 #define WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_TRACKER_H_
 
 #include <map>
 #include <utility>
 
@@ skipping 11 matching lines @@
 class PluginModule;
 class Resource;
 
 // This class maintains a global list of all live pepper resources. It allows
 // us to check resource ID validity and to map them to a specific module.
 //
 // This object is threadsafe.
 class ResourceTracker {
  public:
   // Returns the pointer to the singleton object.
-  static ResourceTracker* Get() {
-    return Singleton<ResourceTracker>::get();
-  }
+  static ResourceTracker* Get();
 
   // PP_Resources --------------------------------------------------------------
 
   // The returned pointer will be NULL if there is no resource. Note that this
   // return value is a scoped_refptr so that we ensure the resource is valid
   // from the point of the lookup to the point that the calling code needs it.
   // Otherwise, the plugin could Release() the resource on another thread and
   // the object will get deleted out from under us.
   scoped_refptr<Resource> GetResource(PP_Resource res) const;
 
@@ skipping 80 matching lines @@
   // destructor will notify us when the module is deleted.
   typedef std::map<PP_Module, PluginModule*> ModuleMap;
   ModuleMap module_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceTracker);
 };
 
 }  // namespace pepper
 
 #endif  // WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_TRACKER_H_