Switch some Singletons to use LeakySingleton.

base/linux_util.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 "base/linux_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <glib.h>
 #include <stdlib.h>
@@ skipping 18 matching lines @@
   STATE_DID_NOT_CHECK  = 0,
   STATE_CHECK_STARTED  = 1,
   STATE_CHECK_FINISHED = 2,
 };
 
 // Helper class for GetLinuxDistro().
 class LinuxDistroHelper {
  public:
   // Retrieves the Singleton.
   static LinuxDistroHelper* Get() {
-    return Singleton<LinuxDistroHelper>::get();
+    return LeakySingleton<LinuxDistroHelper>::get();
   }
 
-  // The simple state machine goes from:
-  // STATE_DID_NOT_CHECK -> STATE_CHECK_STARTED -> STATE_CHECK_FINISHED.
-  LinuxDistroHelper() : state_(STATE_DID_NOT_CHECK) {}
-  ~LinuxDistroHelper() {}
-
   // Retrieve the current state, if we're in STATE_DID_NOT_CHECK,
   // we automatically move to STATE_CHECK_STARTED so nobody else will
   // do the check.
   LinuxDistroState State() {
     AutoLock scoped_lock(lock_);
     if (STATE_DID_NOT_CHECK == state_) {
       state_ = STATE_CHECK_STARTED;
       return STATE_DID_NOT_CHECK;
     }
     return state_;
   }
 
   // Indicate the check finished, move to STATE_CHECK_FINISHED.
   void CheckFinished() {
     AutoLock scoped_lock(lock_);
     DCHECK(state_ == STATE_CHECK_STARTED);
     state_ = STATE_CHECK_FINISHED;
   }
 
  private:
+  friend struct DefaultSingletonTraits<LinuxDistroHelper>;
+
+  // The simple state machine goes from:
+  // STATE_DID_NOT_CHECK -> STATE_CHECK_STARTED -> STATE_CHECK_FINISHED.
+  LinuxDistroHelper() : state_(STATE_DID_NOT_CHECK) {}
+  ~LinuxDistroHelper() {}
+
   Lock lock_;
   LinuxDistroState state_;
 };
 #endif  // if defined(OS_LINUX)
 
 // expected prefix of the target of the /proc/self/fd/%d link for a socket
 static const char kSocketLinkPrefix[] = "socket:[";
 
 // Parse a symlink in /proc/pid/fd/$x and return the inode number of the
 // socket.
@@ skipping 178 matching lines @@
       }
     }
 
     closedir(fd);
   }
 
   return already_found;
 }
 
 }  // namespace base