[Autofill] Move SubKeyRequester to Autofill instead of Payments

Bug: 767931
Test: existing
Change-Id: I3289af3bf4644f8bea05cbe23d14574f0a17a414
Reviewed-on: https://chromium-review.googlesource.com/693089
Commit-Queue: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505902}

chrome/browser/autofill/android/personal_data_manager_android.cc

@@ -330,12 +330,12 @@ PersonalDataManagerAndroid::PersonalDataManagerAndroid(JNIEnv* env, jobject obj)
           ProfileManager::GetActiveUserProfile())),
       address_normalizer_(
           std::unique_ptr<::i18n::addressinput::Source>(
-              new autofill::ChromeMetadataSource(
+              new ChromeMetadataSource(
                   I18N_ADDRESS_VALIDATION_DATA_URL,
                   personal_data_manager_->GetURLRequestContextGetter())),
           ValidationRulesStorageFactory::CreateStorage()),
       subkey_requester_(
-          base::MakeUnique<autofill::ChromeMetadataSource>(
+          base::MakeUnique<ChromeMetadataSource>(
               I18N_ADDRESS_VALIDATION_DATA_URL,
               personal_data_manager_->GetURLRequestContextGetter()),
           ValidationRulesStorageFactory::CreateStorage()) {
@@ -774,7 +774,7 @@ void PersonalDataManagerAndroid::StartRegionSubKeysRequest(
   ScopedJavaGlobalRef<jobject> my_jdelegate;
   my_jdelegate.Reset(env, jdelegate);
 
-  ::payments::SubKeyReceiverCallback cb = base::BindOnce(
+  SubKeyReceiverCallback cb = base::BindOnce(
       &OnSubKeysReceived, ScopedJavaGlobalRef<jobject>(my_jdelegate));
 
   std::string language =

chrome/browser/autofill/android/personal_data_manager_android.h

@@ -15,7 +15,7 @@
 #include "components/autofill/core/browser/address_normalizer_impl.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
-#include "components/payments/core/subkey_requester.h"
+#include "components/autofill/core/browser/subkey_requester.h"
 #include "third_party/libaddressinput/chromium/chrome_address_validator.h"
 
 namespace autofill {
@@ -387,7 +387,7 @@ class PersonalDataManagerAndroid
   AddressNormalizerImpl address_normalizer_;
 
   // Used for subkey request.
-  payments::SubKeyRequester subkey_requester_;
+  SubKeyRequester subkey_requester_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerAndroid);
 };

components/autofill/core/browser/BUILD.gn

@@ -129,6 +129,8 @@ static_library("browser") {
     "risk_data_loader.h",
     "state_names.cc",
     "state_names.h",
+    "subkey_requester.cc",
+    "subkey_requester.h",
     "suggestion.cc",
     "suggestion.h",
     "ui/card_unmask_prompt_controller.h",
@@ -372,6 +374,7 @@ source_set("unit_tests") {
     "phone_number_i18n_unittest.cc",
     "phone_number_unittest.cc",
     "region_combobox_model_unittest.cc",
+    "subkey_requester_unittest.cc",
     "ui/card_unmask_prompt_controller_impl_unittest.cc",
     "validation_unittest.cc",
     "webdata/autocomplete_sync_bridge_unittest.cc",

components/payments/core/subkey_requester.cc → components/autofill/core/browser/subkey_requester.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/payments/core/subkey_requester.h"
+#include "components/autofill/core/browser/subkey_requester.h"
 
 #include <memory>
 #include <utility>
@@ -18,7 +18,8 @@
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/source.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/storage.h"
-namespace payments {
+
+namespace autofill {
 
 namespace {
 
@@ -31,15 +32,15 @@ class SubKeyRequest : public SubKeyRequester::Request {
   SubKeyRequest(const std::string& region_code,
                 const std::string& language,
                 int timeout_seconds,
-                autofill::AddressValidator* address_validator,
+                AddressValidator* address_validator,
                 SubKeyReceiverCallback on_subkeys_received)
       : region_code_(region_code),
         language_(language),
         address_validator_(address_validator),
         on_subkeys_received_(std::move(on_subkeys_received)),
         has_responded_(false),
-        on_timeout_(base::Bind(&::payments::SubKeyRequest::OnRulesLoaded,
-                               base::Unretained(this))) {
+        on_timeout_(
+            base::Bind(&SubKeyRequest::OnRulesLoaded, base::Unretained(this))) {
     base::SequencedTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, on_timeout_.callback(),
         base::TimeDelta::FromSeconds(timeout_seconds));
@@ -69,7 +70,7 @@ class SubKeyRequest : public SubKeyRequester::Request {
   std::string region_code_;
   std::string language_;
   // Not owned. Never null. Outlive this object.
-  autofill::AddressValidator* address_validator_;
+  AddressValidator* address_validator_;
 
   SubKeyReceiverCallback on_subkeys_received_;
 
@@ -139,4 +140,4 @@ void SubKeyRequester::CancelPendingGetSubKeys() {
   pending_subkey_request_.reset();
 }
 
-}  // namespace payments
+}  // namespace autofill

components/payments/core/subkey_requester.h → components/autofill/core/browser/subkey_requester.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PAYMENTS_CORE_SUBKEY_REQUESTER_H_
-#define COMPONENTS_PAYMENTS_CORE_SUBKEY_REQUESTER_H_
+#ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_SUBKEY_REQUESTER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_SUBKEY_REQUESTER_H_
 
 #include "base/macros.h"
 #include "third_party/libaddressinput/chromium/chrome_address_validator.h"
 
-namespace payments {
+namespace autofill {
 
 // This receives a region code and the device's language.
 using SubKeyReceiverCallback =
@@ -19,7 +19,7 @@ using SubKeyReceiverCallback =
 // For a given key (region code for a country, such as US), the list of its
 // corresponding subkeys is the list of that countries admin areas (states,
 // provinces, ..).
-class SubKeyRequester : public autofill::LoadRulesListener {
+class SubKeyRequester : public LoadRulesListener {
  public:
   // The interface for the subkey request.
   class Request {
@@ -28,8 +28,8 @@ class SubKeyRequester : public autofill::LoadRulesListener {
     virtual ~Request() {}
   };
 
-  SubKeyRequester(std::unique_ptr<i18n::addressinput::Source> source,
-                  std::unique_ptr<i18n::addressinput::Storage> storage);
+  SubKeyRequester(std::unique_ptr<::i18n::addressinput::Source> source,
+                  std::unique_ptr<::i18n::addressinput::Storage> storage);
   ~SubKeyRequester() override;
 
   // If the rules for |region_code| are loaded, this gets the subkeys for the
@@ -66,11 +66,11 @@ class SubKeyRequester : public autofill::LoadRulesListener {
   std::string pending_subkey_region_code_;
 
   // The address validator used to load subkeys.
-  autofill::AddressValidator address_validator_;
+  AddressValidator address_validator_;
 
   DISALLOW_COPY_AND_ASSIGN(SubKeyRequester);
 };
 
-}  // namespace payments
+}  // namespace autofill
 
-#endif  // COMPONENTS_PAYMENTS_CORE_SUBKEY_REQUESTER_H_
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_SUBKEY_REQUESTER_H_

components/payments/core/subkey_requester_unittest.cc → components/autofill/core/browser/subkey_requester_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/payments/core/subkey_requester.h"
+#include "components/autofill/core/browser/subkey_requester.h"
 
 #include <utility>
 
@@ -15,7 +15,8 @@
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/storage.h"
 #include "third_party/libaddressinput/src/cpp/test/testdata_source.h"
 
-namespace payments {
+namespace autofill {
+
 namespace {
 
 using ::i18n::addressinput::NullStorage;
@@ -198,4 +199,4 @@ TEST_F(SubKeyRequesterTest, StartRequest_RulesNotLoaded_WillLoad) {
   EXPECT_EQ(subkey_receiver_->subkeys_size(), kCorrectSize);
 }
 
-}  // namespace payments
+}  // namespace autofill

components/payments/content/BUILD.gn

@@ -34,7 +34,6 @@ static_library("content") {
     "//content/public/browser",
     "//mojo/public/cpp/bindings",
     "//third_party/WebKit/public:blink_headers",
-    "//third_party/libphonenumber",
     "//url",
   ]
 }

components/payments/content/DEPS

@@ -12,6 +12,5 @@ include_rules = [
   "+net",
   "+sql",
   "+third_party/WebKit/public/platform/modules/payments",
-  "+third_party/libphonenumber",
   "+ui/base",
 ]

components/payments/core/BUILD.gn

@@ -51,8 +51,6 @@ static_library("core") {
     "payments_validators.h",
     "strings_util.cc",
     "strings_util.h",
-    "subkey_requester.cc",
-    "subkey_requester.h",
   ]
 
   deps = [
@@ -66,7 +64,6 @@ static_library("core") {
     "//net",
     "//services/metrics/public/cpp:metrics_cpp",
     "//services/metrics/public/cpp:ukm_builders",
-    "//third_party/libphonenumber",
     "//third_party/re2",
     "//ui/base",
     "//url",
@@ -120,7 +117,6 @@ source_set("unit_tests") {
     "payments_profile_comparator_unittest.cc",
     "payments_validators_unittest.cc",
     "strings_util_unittest.cc",
-    "subkey_requester_unittest.cc",
   ]
 
   deps = [

components/payments/core/DEPS

@@ -12,7 +12,6 @@ include_rules = [
   "+net",
   "+services/metrics/public",
   "+third_party/libaddressinput",
-  "+third_party/libphonenumber",
   "+third_party/re2",
   "+ui/base",
 ]