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

chrome/app/chrome_main.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 "app/app_paths.h"
 #include "app/app_switches.h"
 #include "app/resource_bundle.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 232 matching lines @@
   base::EnableTerminationOnOutOfMemory();
 #endif  // OS_MACOSX
 
 #if defined(OS_POSIX)
   // Set C library locale to make sure CommandLine can parse argument values
   // in correct encoding.
   setlocale(LC_ALL, "");
 
   SetupSignalHandlers();
 
-  typedef Singleton<base::GlobalDescriptors,
-                    LeakySingletonTraits<base::GlobalDescriptors> >
-      GlobalDescriptorsSingleton;
-  base::GlobalDescriptors* g_fds = GlobalDescriptorsSingleton::get();
+  base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetLeakyInstance();
   g_fds->Set(kPrimaryIPCChannel,
              kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
 #if defined(OS_LINUX)
   g_fds->Set(kCrashDumpSignal,
              kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
 #endif
 #endif  // OS_POSIX
 }
 
 // Perform last-second shutdown work.  Partner of LowLevelInit().
@@ skipping 640 matching lines @@
 
   int exit_code = RunNamedProcessTypeMain(process_type, main_params);
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   LowLevelShutdown();
 
   return exit_code;
 }