Revert of [libphonenumber] Change DEPS to track new github mirror, uprev library

third_party/libphonenumber/BUILD.gn

Index: third_party/libphonenumber/BUILD.gn
diff --git a/third_party/libphonenumber/BUILD.gn b/third_party/libphonenumber/BUILD.gn
index 1c4a0c4379084e2b6128307cdd849eb9a200c140..b72c2ad7c87738361078924a16178e18922c3c8b 100644
--- a/third_party/libphonenumber/BUILD.gn
+++ b/third_party/libphonenumber/BUILD.gn
@@ -15,7 +15,7 @@
 
 config("libphonenumber_config") {
   include_dirs = [
-    "src/cpp/src",
+    "src",
     "$root_gen_dir/third_party/libphonenumber",
   ]
   defines = [ "I18N_PHONENUMBERS_USE_ICU_REGEXP=1" ]
@@ -36,22 +36,22 @@
 # GYP version: third_party/libphonenumber/libphonenumber.gyp:libphonenumber_without_metadata
 static_library("libphonenumber_without_metadata") {
   sources = [
-    "src/cpp/src/phonenumbers/asyoutypeformatter.cc",
-    "src/cpp/src/phonenumbers/base/strings/string_piece.cc",
-    "src/cpp/src/phonenumbers/default_logger.cc",
-    "src/cpp/src/phonenumbers/logger.cc",
-    "src/cpp/src/phonenumbers/phonenumber.cc",
-    "src/cpp/src/phonenumbers/phonenumbermatch.cc",
-    "src/cpp/src/phonenumbers/phonenumbermatcher.cc",
-    "src/cpp/src/phonenumbers/phonenumberutil.cc",
-    "src/cpp/src/phonenumbers/regexp_adapter_icu.cc",
-    "src/cpp/src/phonenumbers/regexp_cache.cc",
-    "src/cpp/src/phonenumbers/string_byte_sink.cc",
-    "src/cpp/src/phonenumbers/stringutil.cc",
-    "src/cpp/src/phonenumbers/unicodestring.cc",
-    "src/cpp/src/phonenumbers/utf/rune.c",
-    "src/cpp/src/phonenumbers/utf/unicodetext.cc",
-    "src/cpp/src/phonenumbers/utf/unilib.cc",
+    "src/phonenumbers/asyoutypeformatter.cc",
+    "src/phonenumbers/base/strings/string_piece.cc",
+    "src/phonenumbers/default_logger.cc",
+    "src/phonenumbers/logger.cc",
+    "src/phonenumbers/phonenumber.cc",
+    "src/phonenumbers/phonenumbermatch.cc",
+    "src/phonenumbers/phonenumbermatcher.cc",
+    "src/phonenumbers/phonenumberutil.cc",
+    "src/phonenumbers/regexp_adapter_icu.cc",
+    "src/phonenumbers/regexp_cache.cc",
+    "src/phonenumbers/string_byte_sink.cc",
+    "src/phonenumbers/stringutil.cc",
+    "src/phonenumbers/unicodestring.cc",
+    "src/phonenumbers/utf/rune.c",
+    "src/phonenumbers/utf/unicodetext.cc",
+    "src/phonenumbers/utf/unilib.cc",
   ]
 
   # libphonenumber's base/logging.h is a minimal implementation where DCHECKs
@@ -81,8 +81,8 @@
   sources = [
     # Comment next line and uncomment the line after, if complete metadata
     # (with examples) is needed.
-    "src/cpp/src/phonenumbers/lite_metadata.cc",
-    #"src/cpp/src/phonenumbers/metadata.cc",
+    "src/phonenumbers/lite_metadata.cc",
+    #"src/phonenumbers/metadata.cc",
   ]
 
   public_deps = [
@@ -93,20 +93,20 @@
 # GYP version: third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests
 test("libphonenumber_unittests") {
   sources = [
-    "src/cpp/src/phonenumbers/test_metadata.cc",
-    "src/cpp/test/phonenumbers/asyoutypeformatter_test.cc",
-    "src/cpp/test/phonenumbers/phonenumbermatch_test.cc",
-    "src/cpp/test/phonenumbers/phonenumbermatcher_test.cc",
-    "src/cpp/test/phonenumbers/phonenumberutil_test.cc",
-    "src/cpp/test/phonenumbers/regexp_adapter_test.cc",
-    "src/cpp/test/phonenumbers/stringutil_test.cc",
-    "src/cpp/test/phonenumbers/test_util.cc",
-    "src/cpp/test/phonenumbers/unicodestring_test.cc",
+    "src/phonenumbers/test_metadata.cc",
+    "src/test/phonenumbers/asyoutypeformatter_test.cc",
+    "src/test/phonenumbers/phonenumbermatch_test.cc",
+    "src/test/phonenumbers/phonenumbermatcher_test.cc",
+    "src/test/phonenumbers/phonenumberutil_test.cc",
+    "src/test/phonenumbers/regexp_adapter_test.cc",
+    "src/test/phonenumbers/stringutil_test.cc",
+    "src/test/phonenumbers/test_util.cc",
+    "src/test/phonenumbers/unicodestring_test.cc",
   ]
 
   configs += [ ":libphonenumber_config_internal" ]
 
-  include_dirs = [ "src/cpp/test" ]
+  include_dirs = [ "src/test" ]
 
   deps = [
     ":libphonenumber_without_metadata",