CPP: Move base/singleton.h to base/memory/singleton.h

cpp/CMakeLists.txt

@@ -309,8 +309,8 @@ install (FILES
 
 install (FILES
   "src/base/basictypes.h"
+  "src/base/memory/singleton.h"
   "src/base/scoped_ptr.h"
-  "src/base/singleton.h"
   DESTINATION include/base/
 )
 install (FILES src/base/synchronization/lock.h

cpp/src/phonenumbers/phonenumberutil.cc

@@ -33,7 +33,7 @@
 #include <unicode/utf8.h>
 
 #include "base/logging.h"
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
 #include "phonenumbers/default_logger.h"
 #include "phonenumbers/encoding_utils.h"
 #include "phonenumbers/metadata.h"

cpp/src/phonenumbers/phonenumberutil.h

@@ -28,8 +28,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/singleton.h"
 #include "base/scoped_ptr.h"
-#include "base/singleton.h"
 #include "phonenumbers/phonenumber.pb.h"
 
 class TelephoneNumber;