Switch some Singletons to use LeakySingleton.

base/singleton.h

 // Copyright (c) 2009 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 BASE_SINGLETON_H_
 #define BASE_SINGLETON_H_
 
 #include "base/at_exit.h"
 #include "base/atomicops.h"
 #include "base/dynamic_annotations.h"
@@ skipping 72 matching lines @@
 // its constructors private, and make DefaultSingletonTraits<> a friend:
 //
 //   #include "base/singleton.h"
 //   class FooClass {
 //    public:
 //     void Bar() { ... }
 //    private:
 //     FooClass() { ... }
 //     friend struct DefaultSingletonTraits<FooClass>;
 //
-//     DISALLOW_EVIL_CONSTRUCTORS(FooClass);
+//     DISALLOW_COPY_AND_ASSIGN(FooClass);
 //   };
 //
 // Caveats:
 // (a) Every call to get(), operator->() and operator*() incurs some overhead
 //     (16ns on my P4/2.8GHz) to check whether the object has already been
 //     initialized.  You may wish to cache the result of get(); it will not
 //     change.
 //
 // (b) Your factory function must never throw an exception. This class is not
 //     exception-safe.
@@ skipping 74 matching lines @@
   // threaded, but we might as well take the precautions anyway.
   static void OnExit(void* unused) {
     // AtExit should only ever be register after the singleton instance was
     // created.  We should only ever get here with a valid instance_ pointer.
     Traits::Delete(reinterpret_cast<Type*>(
         base::subtle::NoBarrier_AtomicExchange(&instance_, 0)));
   }
   static base::subtle::AtomicWord instance_;
 };
 
+template <typename Type, typename DifferentiatingType = Type>
+class LeakySingleton
+    : public Singleton<Type,
+                       LeakySingletonTraits<Type>,
+                       DifferentiatingType> {
+};
+
 template <typename Type, typename Traits, typename DifferentiatingType>
 base::subtle::AtomicWord Singleton<Type, Traits, DifferentiatingType>::
     instance_ = 0;
 
 #endif  // BASE_SINGLETON_H_