Switch some Singletons to use LeakySingleton.

base/singleton.h

Index: base/singleton.h
diff --git a/base/singleton.h b/base/singleton.h
index 3272fce471caa43fb45726ca010863e0b2c027d5..fb4d1eb4b9d2754701bd4077f496c24f734cee7e 100644
--- a/base/singleton.h
+++ b/base/singleton.h
@@ -90,7 +90,7 @@ struct LeakySingletonTraits : public DefaultSingletonTraits<Type> {
 //     FooClass() { ... }
 //     friend struct DefaultSingletonTraits<FooClass>;
 //
-//     DISALLOW_EVIL_CONSTRUCTORS(FooClass);
+//     DISALLOW_COPY_AND_ASSIGN(FooClass);
 //   };
 //
 // Caveats:
@@ -185,6 +185,13 @@ class Singleton {
   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;