CPP: Move base/ to phonenumbers/.

This will be needed to make libphonenumber depend on its own base/ rather than
Chromium's one as it is the case currently.

BUG=http://crbug.com/236272
R=jia.shao.peng@gmail.com

Review URL: https://codereview.appspot.com/8797048

cpp/CMakeLists.txt

@@ -175,8 +175,8 @@ endif ()
 
 set (
   SOURCES
-  "src/base/strings/string_piece.cc"
   "src/phonenumbers/asyoutypeformatter.cc"
+  "src/phonenumbers/base/strings/string_piece.cc"
   "src/phonenumbers/default_logger.cc"
   "src/phonenumbers/logger.cc"
   "src/phonenumbers/phonemetadata.pb.cc" # Generated by Protocol Buffers.
@@ -500,16 +500,19 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
   )
 endif ()
 
-install (FILES "src/base/basictypes.h" DESTINATION include/base/)
+install (
+  FILES "src/phonenumbers/base/basictypes.h"
+  DESTINATION include/phonenumbers/base/
+)
 
 install (FILES
-  "src/base/memory/scoped_ptr.h"
-  "src/base/memory/singleton.h"
-  DESTINATION include/base/memory/
+  "src/phonenumbers/base/memory/scoped_ptr.h"
+  "src/phonenumbers/base/memory/singleton.h"
+  DESTINATION include/phonenumbers/base/memory/
 )
 
-install (FILES "src/base/synchronization/lock.h"
-         DESTINATION include/base/synchronization/)
+install (FILES "src/phonenumbers/base/synchronization/lock.h"
+         DESTINATION include/phonenumbers/base/synchronization/)
 
 install (TARGETS phonenumber LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/)
 

cpp/src/phonenumbers/asyoutypeformatter.cc

@@ -20,8 +20,8 @@
 
 #include <google/protobuf/message_lite.h>
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/phonemetadata.pb.h"
 #include "phonenumbers/phonenumberutil.h"
 #include "phonenumbers/regexp_cache.h"

cpp/src/phonenumbers/asyoutypeformatter.h

@@ -36,8 +36,8 @@
 #include <list>
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/regexp_adapter.h"
 #include "phonenumbers/regexp_cache.h"
 #include "phonenumbers/phonemetadata.pb.h"

cpp/src/phonenumbers/encoding_utils.h

@@ -15,7 +15,7 @@
 #ifndef I18N_PHONENUMBERS_ENCODING_UTILS_H_
 #define I18N_PHONENUMBERS_ENCODING_UTILS_H_
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/utf/unilib.h"
 #include "phonenumbers/utf/utf.h"
 

cpp/src/phonenumbers/geocoding/area_code_map.h

@@ -20,8 +20,8 @@
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 
 namespace i18n {
 namespace phonenumbers {

cpp/src/phonenumbers/geocoding/default_map_storage.cc

@@ -16,8 +16,8 @@
 
 #include "phonenumbers/geocoding/default_map_storage.h"
 
-#include "base/basictypes.h"
-#include "base/logging.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
 #include "phonenumbers/geocoding/geocoding_data.h"
 
 namespace i18n {

cpp/src/phonenumbers/geocoding/default_map_storage.h

@@ -19,7 +19,7 @@
 #ifndef I18N_PHONENUMBERS_DEFAULT_MAP_STORAGE_H_
 #define I18N_PHONENUMBERS_DEFAULT_MAP_STORAGE_H_
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {

cpp/src/phonenumbers/geocoding/geocoding_data.h

@@ -17,7 +17,7 @@
 #ifndef I18N_PHONENUMBERS_GEOCODING_DATA
 #define I18N_PHONENUMBERS_GEOCODING_DATA
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {

cpp/src/phonenumbers/geocoding/mapping_file_provider.h

@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {

cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h

@@ -22,8 +22,8 @@
 
 #include <unicode/locid.h>  // NOLINT(build/include_order)
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 
 namespace i18n {
 namespace phonenumbers {

cpp/src/phonenumbers/phonenumbermatch.h

@@ -53,7 +53,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/phonenumber.pb.h"
 
 namespace i18n {

cpp/src/phonenumbers/phonenumbermatcher.cc

@@ -25,9 +25,9 @@
 #endif  // USE_ICU_REGEXP
 
 #include <ctype.h>
-#include <map>
 #include <iostream>
 #include <limits>
+#include <map>
 #include <stddef.h>
 #include <string>
 #include <utility>
@@ -35,10 +35,10 @@
 
 #include <unicode/uchar.h>
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/singleton.h"
 #include "phonenumbers/alternate_format.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/singleton.h"
 #include "phonenumbers/callback.h"
 #include "phonenumbers/default_logger.h"
 #include "phonenumbers/encoding_utils.h"

cpp/src/phonenumbers/phonenumbermatcher.h

@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/callback.h"
 #include "phonenumbers/regexp_adapter.h"
 

cpp/src/phonenumbers/phonenumberutil.cc

@@ -32,10 +32,10 @@
 #include <unicode/uchar.h>
 #include <unicode/utf8.h>
 
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/memory/singleton.h"
 #include "phonenumbers/asyoutypeformatter.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/singleton.h"
 #include "phonenumbers/default_logger.h"
 #include "phonenumbers/encoding_utils.h"
 #include "phonenumbers/metadata.h"

cpp/src/phonenumbers/phonenumberutil.h

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

cpp/src/phonenumbers/regexp_adapter_icu.cc

@@ -28,9 +28,9 @@
 #include <unicode/stringpiece.h>
 #include <unicode/unistr.h>
 
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/default_logger.h"
 #include "phonenumbers/string_byte_sink.h"
 

cpp/src/phonenumbers/regexp_adapter_re2.cc

@@ -23,8 +23,8 @@
 #include <re2/re2.h>
 #include <re2/stringpiece.h>
 
-#include "base/basictypes.h"
-#include "base/logging.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/logging.h"
 #include "phonenumbers/stringutil.h"
 
 namespace i18n {

cpp/src/phonenumbers/regexp_cache.cc

@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 
-#include "base/synchronization/lock.h"
+#include "phonenumbers/base/synchronization/lock.h"
 #include "phonenumbers/regexp_adapter.h"
 
 using std::string;

cpp/src/phonenumbers/regexp_cache.h

@@ -30,9 +30,9 @@
 #include <cstddef>
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
+#include "phonenumbers/base/synchronization/lock.h"
 
 #ifdef USE_TR1_UNORDERED_MAP
 #  include <tr1/unordered_map>

cpp/src/phonenumbers/shortnumberutil.cc

@@ -16,7 +16,7 @@
 
 #include "phonenumbers/shortnumberutil.h"
 
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/phonemetadata.pb.h"
 #include "phonenumbers/phonenumberutil.h"
 #include "phonenumbers/regexp_adapter.h"

cpp/src/phonenumbers/shortnumberutil.h

@@ -27,7 +27,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {

cpp/src/phonenumbers/stringutil.h

@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace i18n {
 namespace phonenumbers {

cpp/src/phonenumbers/utf/stringpiece.h

@@ -16,7 +16,7 @@
 #ifndef STRINGS_STRINGPIECE_H_
 #define STRINGS_STRINGPIECE_H_
 
-#include "base/strings/string_piece.h"
+#include "phonenumbers/base/strings/string_piece.h"
 
 using base::StringPiece;
 

cpp/src/phonenumbers/utf/stringprintf.h

@@ -17,6 +17,6 @@
 #define STRINGS_STRINGPRINTF_H_
 
 //#include "third_party/chromium/src/base/string_util.h"
-#include "base/string_util.h"
+#include "phonenumbers/base/string_util.h"
 
 #endif  // STRINGS_STRINGPRINTF_H_

cpp/src/phonenumbers/utf/unicodetext.cc

@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "phonenumbers/utf/unicodetext.h"
-//#include "base/logging.h"
+//#include "phonenumbers/base/logging.h"
 #include "phonenumbers/utf/stringpiece.h"
 //#include "utf/stringprintf.h"
 #include "phonenumbers/utf/utf.h"

cpp/src/phonenumbers/utf/unicodetext.h

@@ -20,7 +20,7 @@
 #include <iterator>
 #include <string>
 #include <utility>
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 //#include "util/utf8/public/config.h"
 
 using std::string;

cpp/src/phonenumbers/utf/unilib.cc

@@ -18,7 +18,7 @@
 
 #include "phonenumbers/utf/unilib.h"
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/utf/utf.h"
 
 namespace UniLib {

cpp/src/phonenumbers/utf/unilib.h

@@ -32,7 +32,7 @@
 #define UTIL_UTF8_UNILIB_H__
 
 #include <string>
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 
 namespace UniLib {
 

cpp/test/phonenumbers/asyoutypeformatter_test.cc

@@ -22,8 +22,8 @@
 
 #include <gtest/gtest.h>
 
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "phonenumbers/base/logging.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
 #include "phonenumbers/phonenumberutil.h"
 #include "phonenumbers/test_util.h"
 

cpp/test/phonenumbers/geocoding/geocoding_data_test.cc

@@ -20,7 +20,7 @@
 
 #include <gtest/gtest.h>  // NOLINT(build/include_order)
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/geocoding/geocoding_data.h"
 #include "phonenumbers/geocoding/geocoding_test_data.h"
 #include "phonenumbers/stringutil.h"

cpp/test/phonenumbers/geocoding/geocoding_test_data.h

@@ -15,7 +15,7 @@
 #ifndef I18N_PHONENUMBERS_GEOCODING_TEST_DATA
 #define I18N_PHONENUMBERS_GEOCODING_TEST_DATA
 
-#include "base/basictypes.h"
+#include "phonenumbers/base/basictypes.h"
 #include "phonenumbers/geocoding/geocoding_data.h"
 
 namespace i18n {

cpp/test/phonenumbers/logger_test.cc

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

cpp/test/phonenumbers/phonenumbermatcher_test.cc

@@ -22,9 +22,9 @@
 #include <gtest/gtest.h>
 #include <unicode/unistr.h>
 
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/singleton.h"
+#include "phonenumbers/base/basictypes.h"
+#include "phonenumbers/base/memory/scoped_ptr.h"
+#include "phonenumbers/base/memory/singleton.h"
 #include "phonenumbers/phonenumber.h"
 #include "phonenumbers/phonenumber.pb.h"
 #include "phonenumbers/phonenumbermatch.h"

cpp/test/phonenumbers/regexp_adapter_test.cc

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

tools/cpp/src/cpp-build/generate_geocoding_data.cc

@@ -279,7 +279,7 @@ void WriteCppHeader(const string& base_name, FILE* output) {
   fprintf(output, "#include \"phonenumbers/geocoding/%s.h\"\n",
           base_name.c_str());
   fprintf(output, "\n");
-  fprintf(output, "#include \"base/basictypes.h\"\n");
+  fprintf(output, "#include \"phonenumbers/base/basictypes.h\"\n");
   fprintf(output, "\n");
 }