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

Changes to build files and include paths.

BUG=585286,585244
TBR=tedchoc

Review URL: https://codereview.chromium.org/1674373003

Cr-Commit-Position: refs/heads/master@{#374841}

5 files changed, 77 insertions, 85 deletions

diff --git a/third_party/libphonenumber/BUILD.gn b/third_party/libphonenumber/BUILD.gn
index b72c2ad..1c4a0c4 100644
--- a/third_party/libphonenumber/BUILD.gn
+++ b/third_party/libphonenumber/BUILD.gn
@@ -15,7 +15,7 @@ proto_library("proto") {
 
 config("libphonenumber_config") {
   include_dirs = [
-    "src",
+    "src/cpp/src",
     "$root_gen_dir/third_party/libphonenumber",
   ]
   defines = [ "I18N_PHONENUMBERS_USE_ICU_REGEXP=1" ]
@@ -36,22 +36,22 @@ config("libphonenumber_config_internal") {
 # 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
@@ -81,8 +81,8 @@ 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 = [
@@ -93,20 +93,20 @@ static_library("libphonenumber") {
 # 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",
diff --git a/third_party/libphonenumber/README.chromium b/third_party/libphonenumber/README.chromium
index 23d6932..54e43d8 100644
--- a/third_party/libphonenumber/README.chromium
+++ b/third_party/libphonenumber/README.chromium
@@ -1,14 +1,13 @@
 Name: International Phone Number Library
 Short Name: libphonenumber
-URL: http://libphonenumber.googlecode.com/svn/trunk/
+URL: https://github.com/googlei18n/libphonenumber
 Version: unknown
-Revision: 584
+Revision: a9bd368debe74355364965c24bcc5a6bfb1dc546
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes
 
-This directory contains the source code of International Phone Number Library
-for C/C++.
+This directory contains the source code of International Phone Number Library.
 
 This library depends on
 - third_party/icu for internationalisation, UTF8-16-32 conversion and regular
@@ -16,18 +15,11 @@ This library depends on
 - third_party/protobuf Lite version.
 
 Additional files, not in the original library:
+  BUILD.gn
   libphonenumber.gyp
   README.chromium
   LICENSE # Taken from https://github.com/googlei18n/libphonenumber/
-  src/phonenumber_api.h
-
-The library is mapped through the DEPS file into src/ folder. To update:
-1. Get the latest version number from
-   http://code.google.com/p/libphonenumber/source/list
-2. Locally update this file and DEPS.
-3. run 'gclient sync'
-4. Adjust libphonenumber.gyp if necessary.
-5. Verify that all compiles and all of the tests are successfull.
+  phonenumber_api.h
 
 WARNING: This library is only thread-safe on POSIX. This means that
 PhoneNumberUtil and the other singletons should be accessed from a single
diff --git a/third_party/libphonenumber/libphonenumber.gyp b/third_party/libphonenumber/libphonenumber.gyp
index 363451b..b882123 100644
--- a/third_party/libphonenumber/libphonenumber.gyp
+++ b/third_party/libphonenumber/libphonenumber.gyp
@@ -5,8 +5,8 @@
 {
   'target_defaults': {
     'include_dirs': [
-      'src',
-      'src/test',
+      'src/cpp/src',
+      'src/cpp/test',
       # The libphonenumber source (and test code) expects the
       # generated protocol headers to be available with "phonenumbers" include
       # path, e.g. #include "phonenumbers/foo.pb.h".
@@ -44,22 +44,22 @@
       '../protobuf/protobuf.gyp:protobuf_lite',
     ],
     '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',
       'src/resources/phonemetadata.proto',
       'src/resources/phonenumber.proto',
     ],
@@ -75,7 +75,7 @@
     'direct_dependent_settings': {
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
-        'src',
+        'src/cpp/src',
       ],
       'defines': [
         'I18N_PHONENUMBERS_USE_ICU_REGEXP=1',
@@ -110,8 +110,8 @@
     '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',
     ],
   },
   {
@@ -119,15 +119,15 @@
     'target_name': 'libphonenumber_unittests',
     'type': 'executable',
     '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',
     ],
     'dependencies': [
       '../icu/icu.gyp:icui18n',
diff --git a/third_party/libphonenumber/phonenumber_api.h b/third_party/libphonenumber/phonenumber_api.h
new file mode 100644
index 0000000..a784cb2
--- /dev/null
+++ b/third_party/libphonenumber/phonenumber_api.h
@@ -0,0 +1,13 @@
+// Copyright (c) 2011 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.
+
+#ifndef THIRD_PARTY_LIBPHONENUMBER_PHONENUMBER_API_H_
+#define THIRD_PARTY_LIBPHONENUMBER_PHONENUMBER_API_H_
+#pragma once
+
+#define USE_GOOGLE_BASE
+#include "third_party/libphonenumber/src/cpp/src/phonenumbers/phonenumberutil.h"
+#undef USE_GOOGLE_BASE
+
+#endif  // THIRD_PARTY_LIBPHONENUMBER_PHONENUMBER_API_H_
diff --git a/third_party/libphonenumber/src/phonenumber_api.h b/third_party/libphonenumber/src/phonenumber_api.h
deleted file mode 100644
index 4a7fcd1..0000000
--- a/third_party/libphonenumber/src/phonenumber_api.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef THIRD_PARTY_LIBPHONENUMBER_SRC_PHONENUMBER_API_H_
-#define THIRD_PARTY_LIBPHONENUMBER_SRC_PHONENUMBER_API_H_
-#pragma once
-
-#define USE_GOOGLE_BASE
-#include "third_party/libphonenumber/src/phonenumbers/phonenumberutil.h"
-#undef USE_GOOGLE_BASE
-
-#endif  // THIRD_PARTY_LIBPHONENUMBER_SRC_PHONENUMBER_API_H_