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

third_party/libphonenumber/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 proto_library("proto") {
   sources = [
     "src/resources/phonemetadata.proto",
     "src/resources/phonenumber.proto",
   ]
   proto_out_dir = "third_party/libphonenumber/phonenumbers"
 }
 
 config("libphonenumber_config") {
   include_dirs = [
-    "src",
+    "src/cpp/src",
     "$root_gen_dir/third_party/libphonenumber",
   ]
   defines = [ "I18N_PHONENUMBERS_USE_ICU_REGEXP=1" ]
   if (!is_android) {
     defines += [ "I18N_PHONENUMBERS_NO_THREAD_SAFETY=1" ]
   }
 }
 
 config("libphonenumber_config_internal") {
   if (is_clang) {
     cflags = [
       # https://github.com/googlei18n/libphonenumber/pull/741
       "-Wno-unused-private-field",
     ]
   }
 }
 
 # GYP version: third_party/libphonenumber/libphonenumber.gyp:libphonenumber_without_metadata
 static_library("libphonenumber_without_metadata") {
   sources = [
-    "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",
+    "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",
   ]
 
   # libphonenumber's base/logging.h is a minimal implementation where DCHECKs
   # do not consume their arguments. This leads to unused variable warnings in
   # release builds.
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",
     ":libphonenumber_config_internal",
   ]
 
   public_configs = [ ":libphonenumber_config" ]
 
   public_deps = [
     ":proto",
   ]
   deps = [
     ":proto",
     "//third_party/icu",
     "//third_party/protobuf:protobuf_lite",
   ]
 }
 
 # Library used by clients that includes production metadata.
 # GYP version: third_party/libphonenumber/libphonenumber.gyp:libphonenumber
 static_library("libphonenumber") {
   sources = [
     # Comment next line and uncomment the line after, if complete metadata
     # (with examples) is needed.
-    "src/phonenumbers/lite_metadata.cc",
-    #"src/phonenumbers/metadata.cc",
+    "src/cpp/src/phonenumbers/lite_metadata.cc",
+    #"src/cpp/src/phonenumbers/metadata.cc",
   ]
 
   public_deps = [
     ":libphonenumber_without_metadata",
   ]
 }
 
 # GYP version: third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests
 test("libphonenumber_unittests") {
   sources = [
-    "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",
+    "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",
   ]
 
   configs += [ ":libphonenumber_config_internal" ]
 
-  include_dirs = [ "src/test" ]
+  include_dirs = [ "src/cpp/test" ]
 
   deps = [
     ":libphonenumber_without_metadata",
     "//base",
     "//base/test:run_all_unittests",
     "//base/third_party/dynamic_annotations",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/icu",
   ]
 }