Cpp: Move scoped_ptr.h to memory folder.

cpp/CMakeLists.txt

@@ -317,13 +317,15 @@ install (FILES
   DESTINATION include/phonenumbers/
 )
 
+install (FILES src/base/basictypes.h
+         DESTINATION include/base/)
+
 install (FILES
-  "src/base/basictypes.h"
-  "src/base/scoped_ptr.h"
-  DESTINATION include/base/
+  "src/base/memory/scoped_ptr.h"
+  "src/base/memory/singleton.h"
+  DESTINATION include/base/memory/
 )
-install (FILES src/base/memory/singleton.h
-         DESTINATION include/base/memory/)
+
 install (FILES src/base/synchronization/lock.h
          DESTINATION include/base/synchronization/)
 

cpp/src/phonenumbers/logger.h

@@ -20,8 +20,6 @@
 #include <cstdio>
 #include <string>
 
-#include <base/scoped_ptr.h>
-
 namespace i18n {
 namespace phonenumbers {
 

cpp/src/phonenumbers/phonenumberutil.h

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

cpp/src/phonenumbers/regexp_adapter_icu.cc

@@ -24,7 +24,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "phonenumbers/default_logger.h"
 
 namespace i18n {

cpp/src/phonenumbers/regexp_cache.h

@@ -31,7 +31,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 
 #ifdef USE_TR1_UNORDERED_MAP

cpp/test/phonenumbers/logger_test.cc

@@ -18,6 +18,7 @@
 
 #include <gtest/gtest.h>
 
+#include "base/memory/scoped_ptr.h"
 #include "phonenumbers/default_logger.h"
 
 namespace i18n {

cpp/test/phonenumbers/regexp_adapter_test.cc

@@ -23,7 +23,7 @@
 #include <gtest/gtest.h>
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "phonenumbers/stl_util.h"
 #include "phonenumbers/stringutil.h"