Access singletons with a new GetInstance() method instead of Singleton<T>.

app/surface/io_surface_support_mac.cc

 // 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.
 
 #include <dlfcn.h>
 
 #include "base/singleton.h"
 #include "app/surface/io_surface_support_mac.h"
 
 typedef CFTypeRef (*IOSurfaceCreateProcPtr)(CFDictionaryRef properties);
@@ skipping 62 matching lines @@
   IOSurfaceLookupFromMachPortProcPtr io_surface_lookup_from_mach_port_;
   IOSurfaceGetWidthPtr io_surface_get_width_;
   IOSurfaceGetHeightPtr io_surface_get_height_;
   CGLTexImageIOSurface2DProcPtr cgl_tex_image_io_surface_2d_;
   bool initialized_successfully_;
 
   friend struct DefaultSingletonTraits<IOSurfaceSupportImpl>;
   DISALLOW_COPY_AND_ASSIGN(IOSurfaceSupportImpl);
 };
 
-static Singleton<IOSurfaceSupportImpl> sole_instance_;
-
 IOSurfaceSupportImpl* IOSurfaceSupportImpl::Initialize() {
-  IOSurfaceSupportImpl* impl = sole_instance_.get();
+  IOSurfaceSupportImpl* impl = Singleton<IOSurfaceSupportImpl>::get();
   if (impl->InitializedSuccessfully())
     return impl;
   return NULL;
 }
 
 CFStringRef IOSurfaceSupportImpl::GetKIOSurfaceWidth() {
   return k_io_surface_width_;
 }
 
 CFStringRef IOSurfaceSupportImpl::GetKIOSurfaceHeight() {
@@ skipping 166 matching lines @@
 IOSurfaceSupport* IOSurfaceSupport::Initialize() {
   return IOSurfaceSupportImpl::Initialize();
 }
 
 IOSurfaceSupport::IOSurfaceSupport() {
 }
 
 IOSurfaceSupport::~IOSurfaceSupport() {
 }