[Payments] Format and validate phone number by using libphonenumber

chrome/browser/autofill/android/phone_number_util_android.cc

Index: chrome/browser/autofill/android/phone_number_util_android.cc
diff --git a/chrome/browser/autofill/android/phone_number_util_android.cc b/chrome/browser/autofill/android/phone_number_util_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1bce951b1ef63d9d28ccb359741363c7da4406ef
--- /dev/null
+++ b/chrome/browser/autofill/android/phone_number_util_android.cc
@@ -0,0 +1,77 @@
+// Copyright 2017 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.
+
+#include "chrome/browser/autofill/android/phone_number_util_android.h"
+
+#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
+#include "chrome/browser/browser_process.h"
+#include "components/autofill/core/browser/autofill_country.h"
+#include "jni/PhoneNumberUtil_jni.h"
+#include "third_party/libphonenumber/phonenumber_api.h"
+
+using base::android::ConvertJavaStringToUTF8;

[please use gerrit instead, 2017/03/14 18:17:15]

Prepend "base" with "::" and put these "using" statements inside of anonymous
namespace, which should be inside of the "autofill" namespace. That prevents
polluting the namespaces of the header files that you have included above.

namespace autofill {
namespace {
using ::base::android::ConvertJavaStringToUTF8;
...

[gogerald1, 2017/03/14 19:32:33]

Done.

+using base::android::ConvertUTF8ToJavaString;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaLocalRef;
+using ::i18n::phonenumbers::PhoneNumber;
+using ::i18n::phonenumbers::PhoneNumberUtil;
+
+namespace autofill {
+
+// Formats the given number |jphone_number| to
+// i18n::phonenumbers::PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL format
+// by using i18n::phonenumbers::PhoneNumberUtil::Format.
+ScopedJavaLocalRef<jstring> Format(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jclass>& jcaller,
+    const JavaParamRef<jstring>& jphone_number) {
+  const std::string phone_number = ConvertJavaStringToUTF8(env, jphone_number);
+  const std::string default_region_code =
+      autofill::AutofillCountry::CountryCodeForLocale(
+          g_browser_process->GetApplicationLocale());
+
+  PhoneNumber parsed_number;
+  PhoneNumberUtil* phone_number_util = PhoneNumberUtil::GetInstance();
+  if (phone_number_util->Parse(phone_number, default_region_code,
+                               &parsed_number) !=
+      PhoneNumberUtil::NO_PARSING_ERROR) {
+    return ConvertUTF8ToJavaString(env, phone_number);
+  }
+
+  std::string formatted_number;
+  phone_number_util->Format(parsed_number,
+                            PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL,
+                            &formatted_number);
+
+  return ConvertUTF8ToJavaString(env, formatted_number);
+}
+
+// Checks whether the given number |jphone_number| is valid by using
+// i18n::phonenumbers::PhoneNumberUtil::IsValidNumber.
+jboolean IsValidNumber(JNIEnv* env,
+                       const base::android::JavaParamRef<jclass>& jcaller,
+                       const JavaParamRef<jstring>& jphone_number) {
+  const std::string phone_number = ConvertJavaStringToUTF8(env, jphone_number);
+  const std::string default_region_code =
+      autofill::AutofillCountry::CountryCodeForLocale(
+          g_browser_process->GetApplicationLocale());
+
+  PhoneNumber parsed_number;
+  PhoneNumberUtil* phone_number_util = PhoneNumberUtil::GetInstance();
+  if (phone_number_util->Parse(phone_number, default_region_code,
+                               &parsed_number) !=
+      PhoneNumberUtil::NO_PARSING_ERROR) {
+    return false;
+  }
+
+  return phone_number_util->IsValidNumber(parsed_number);
+}
+
+}  // namespace autofill
+
+// static
+bool RegisterPhoneNumberUtil(JNIEnv* env) {
+  return autofill::RegisterNativesImpl(env);
+}