Change AccelerometerReader to a Singleton

chromeos/accelerometer/accelerometer_reader.cc

Index: chromeos/accelerometer/accelerometer_reader.cc
diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc
index 340ba18856cddb06727db4dac7781ba448c1fc05..c0644aa34c5a6ffe5addb4a00ad6d69b46840740 100644
--- a/chromeos/accelerometer/accelerometer_reader.cc
+++ b/chromeos/accelerometer/accelerometer_reader.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
+#include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ -183,12 +184,10 @@ AccelerometerReader::ConfigurationData::ConfigurationData()
 AccelerometerReader::ConfigurationData::~ConfigurationData() {
 }
 
-AccelerometerReader::AccelerometerReader()
-    : configuration_(new AccelerometerReader::Configuration()),
-      weak_factory_(this) {
-}
-
-AccelerometerReader::~AccelerometerReader() {
+// static
+AccelerometerReader* AccelerometerReader::GetInstance() {
+  return Singleton<AccelerometerReader,
+                   LeakySingletonTraits<AccelerometerReader>>::get();

[oshima, 2015/01/07 16:39:57]

why this needs to be leaky?

[jonross, 2015/01/12 15:15:46]

As discussed offline this is not necessary. Thanks for the clarification.

I've changed this to use a normal Singleton.

 }
 
 void AccelerometerReader::Initialize(
@@ -212,6 +211,14 @@ void AccelerometerReader::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
+AccelerometerReader::AccelerometerReader()
+    : configuration_(new AccelerometerReader::Configuration()),
+      weak_factory_(this) {
+}
+
+AccelerometerReader::~AccelerometerReader() {
+}
+
 void AccelerometerReader::OnInitialized(
     scoped_refptr<AccelerometerReader::Configuration> configuration,
     bool success) {