Merge-70 [AF] Get account from PDM instead of IdentityManager

Actually Two changes bundled here

1) Get account from Personal data manager instead of IdentityManager
2) (Small helper method) Personal datamanager changes to denote fullsync user or not that can be propagated to rest of the Autofill module.
Goal is to send it to payment RPCs.

[email protected]

(cherry picked from commit 7ba5ea8)

Bug: 880861, 840703
Change-Id: I61422018c9fe6755f7315ccc692ab6245ed754da
Reviewed-on: https://chromium-review.googlesource.com/1184030
Commit-Queue: Sebastien Seguin-Gagnon <[email protected]>
Reviewed-by: Mathieu Perreault <[email protected]>
Reviewed-by: Sebastien Seguin-Gagnon <[email protected]>
Reviewed-by: David Roger <[email protected]>
Reviewed-by: Marc Treib <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#588608}
Reviewed-on: https://chromium-review.googlesource.com/1208137
Cr-Commit-Position: refs/branch-heads/3538@{#67}
Cr-Branched-From: 79f7c91-refs/heads/master@{#587811}

Author: sebsg

chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc

@@ -19,6 +19,7 @@
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/payments/full_card_request.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_clock.h"
 #include "components/grit/components_scaled_resources.h"
@@ -66,6 +67,7 @@ CvcUnmaskViewController::CvcUnmaskViewController(
           IdentityManagerFactory::GetForProfile(
               Profile::FromBrowserContext(web_contents_->GetBrowserContext())
                   ->GetOriginalProfile()),
+          state->GetPersonalDataManager(),
           Profile::FromBrowserContext(web_contents_->GetBrowserContext())
               ->IsOffTheRecord()),
       full_card_request_(this,

components/autofill/core/browser/BUILD.gn

@@ -8,6 +8,7 @@ import("//testing/libfuzzer/fuzzer_test.gni")
 
 jumbo_static_library("browser") {
   sources = [
+    "account_info_getter.h",
     "address.cc",
     "address.h",
     "address_combobox_model.cc",

components/autofill/core/browser/DEPS

@@ -6,12 +6,7 @@ include_rules = [
   "+components/metrics",
   "+components/policy",
   "+components/security_state",
-
-  # Autofill depends on //services/identity/public/cpp for its core Google
-  # identity dependencies, but depends on this isolated file for recording
-  # some browser-specific signin metrics.
-  "+components/signin/core/browser/signin_metrics.h",
-
+  "+components/signin/core/browser",
   "+components/sync",
   "+components/variations",
   "+components/version_info",

components/autofill/core/browser/account_info_getter.h

@@ -0,0 +1,30 @@
+// Copyright 2018 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 COMPONENTS_AUTOFILL_CORE_BROWSER_ACCOUNT_INFO_GETTER_H_
+#define COMPONENTS_AUTOFILL_CORE_BROWSER_ACCOUNT_INFO_GETTER_H_
+
+#include <string>
+
+namespace autofill {
+
+// Interface to get account information in Autofill.
+class AccountInfoGetter {
+ public:
+  // Returns the account id of the active signed-in user irrespective of
+  // whether they enabled sync or not.
+  virtual std::string GetActiveSignedInAccountId() const = 0;
+
+  // Returns true - When user is both signed-in and enabled sync.
+  // Returns false - When user is not signed-in or does not have sync the
+  // feature enabled.
+  virtual bool IsSyncFeatureEnabled() const = 0;
+
+ protected:
+  virtual ~AccountInfoGetter() {}
+};
+
+}  // namespace autofill
+
+#endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_ACCOUNT_INFO_GETTER_H_

components/autofill/core/browser/autofill_manager.cc

@@ -1121,6 +1121,7 @@ AutofillManager::AutofillManager(
           driver->GetURLLoaderFactory(),
           client->GetPrefs(),
           client->GetIdentityManager(),
+          client->GetPersonalDataManager(),
           driver->IsIncognito())),
       app_locale_(app_locale),
       personal_data_(personal_data),

components/autofill/core/browser/credit_card_save_manager_unittest.cc

@@ -113,7 +113,7 @@ class CreditCardSaveManagerTest : public testing::Test {
     autofill_driver_->SetURLRequestContext(request_context_.get());
     payments_client_ = new payments::TestPaymentsClient(
         autofill_driver_->GetURLLoaderFactory(), autofill_client_.GetPrefs(),
-        autofill_client_.GetIdentityManager());
+        autofill_client_.GetIdentityManager(), &personal_data_);
     credit_card_save_manager_ =
         new TestCreditCardSaveManager(autofill_driver_.get(), &autofill_client_,
                                       payments_client_, &personal_data_);

components/autofill/core/browser/local_card_migration_manager_unittest.cc

@@ -69,7 +69,7 @@ class LocalCardMigrationManagerTest : public testing::Test {
     autofill_driver_->SetURLRequestContext(request_context_.get());
     payments_client_ = new payments::TestPaymentsClient(
         autofill_driver_->GetURLLoaderFactory(), autofill_client_.GetPrefs(),
-        autofill_client_.GetIdentityManager());
+        autofill_client_.GetIdentityManager(), &personal_data_);
     credit_card_save_manager_ =
         new TestCreditCardSaveManager(autofill_driver_.get(), &autofill_client_,
                                       payments_client_, &personal_data_);

components/autofill/core/browser/payments/full_card_request_unittest.cc

@@ -81,7 +81,7 @@ class FullCardRequestTest : public testing::Test {
     autofill_client_.SetPrefs(std::move(pref_service));
     payments_client_ = std::make_unique<PaymentsClient>(
         test_shared_loader_factory_, autofill_client_.GetPrefs(),
-        autofill_client_.GetIdentityManager());
+        autofill_client_.GetIdentityManager(), &personal_data_);
     request_ = std::make_unique<FullCardRequest>(
         &autofill_client_, payments_client_.get(), &personal_data_);
     // Silence the warning from PaymentsClient about matching sync and Payments

components/autofill/core/browser/payments/payments_client.cc

@@ -17,6 +17,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "components/autofill/core/browser/account_info_getter.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
@@ -226,6 +227,13 @@ void SetActiveExperiments(const std::vector<const char*>& active_experiments,
                     std::move(active_chrome_experiments));
 }
 
+bool ShouldUseActiveSignedInAccount() {
+  return base::FeatureList::IsEnabled(
+             features::kAutofillEnableAccountWalletStorage) ||
+         base::FeatureList::IsEnabled(
+             features::kAutofillGetPaymentsIdentityFromSync);
+}
+
 class UnmaskCardRequest : public PaymentsRequest {
  public:
   UnmaskCardRequest(const PaymentsClient::UnmaskRequestDetails& request_details,
@@ -625,10 +633,12 @@ PaymentsClient::PaymentsClient(
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
     PrefService* pref_service,
     identity::IdentityManager* identity_manager,
+    AccountInfoGetter* account_info_getter,
     bool is_off_the_record)
     : url_loader_factory_(url_loader_factory),
       pref_service_(pref_service),
       identity_manager_(identity_manager),
+      account_info_getter_(account_info_getter),
       is_off_the_record_(is_off_the_record),
       has_retried_authorization_(false),
       weak_ptr_factory_(this) {}
@@ -843,20 +853,25 @@ void PaymentsClient::StartTokenFetch(bool invalidate_old) {
   if (!invalidate_old && token_fetcher_)
     return;
 
+  DCHECK(account_info_getter_);
+
   OAuth2TokenService::ScopeSet payments_scopes;
   payments_scopes.insert(kPaymentsOAuth2Scope);
+  std::string account_id =
+      ShouldUseActiveSignedInAccount()
+          ? account_info_getter_->GetActiveSignedInAccountId()
+          : identity_manager_->GetPrimaryAccountInfo().account_id;
   if (invalidate_old) {
     DCHECK(!access_token_.empty());
-    identity_manager_->RemoveAccessTokenFromCache(
-        identity_manager_->GetPrimaryAccountInfo().account_id, payments_scopes,
-        access_token_);
+    identity_manager_->RemoveAccessTokenFromCache(account_id, payments_scopes,
+                                                  access_token_);
   }
   access_token_.clear();
-  token_fetcher_ = std::make_unique<identity::PrimaryAccountAccessTokenFetcher>(
-      kTokenFetchId, identity_manager_, payments_scopes,
+  token_fetcher_ = identity_manager_->CreateAccessTokenFetcherForAccount(
+      account_id, kTokenFetchId, payments_scopes,
       base::BindOnce(&PaymentsClient::AccessTokenFetchFinished,
                      base::Unretained(this)),
-      identity::PrimaryAccountAccessTokenFetcher::Mode::kImmediate);
+      identity::AccessTokenFetcher::Mode::kImmediate);
 }
 
 void PaymentsClient::SetOAuth2TokenAndStartRequest() {

components/autofill/core/browser/payments/payments_client.h

@@ -15,11 +15,11 @@
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/prefs/pref_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "services/identity/public/cpp/access_token_fetcher.h"
 #include "services/identity/public/cpp/access_token_info.h"
 
 namespace identity {
 class IdentityManager;
-class PrimaryAccountAccessTokenFetcher;
 }  // namespace identity
 
 namespace network {
@@ -30,6 +30,7 @@ class SharedURLLoaderFactory;
 
 namespace autofill {
 
+class AccountInfoGetter;
 class MigratableCreditCard;
 
 namespace payments {
@@ -110,13 +111,14 @@ class PaymentsClient {
 
   // |url_loader_factory| is reference counted so it has no lifetime or
   // ownership requirements. |pref_service| is used to get the registered
-  // preference value, |identity_manager|, |unmask_delegate| and |save_delegate|
+  // preference value, |identity_manager| and |account_info_getter|
   // must all outlive |this|. Either delegate might be nullptr.
   // |is_off_the_record| denotes incognito mode.
   PaymentsClient(
       scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
-      PrefService* pref_service,
-      identity::IdentityManager* identity_manager,
+      PrefService* const pref_service,
+      identity::IdentityManager* const identity_manager,
+      AccountInfoGetter* const account_info_getter,
       bool is_off_the_record = false);
 
   virtual ~PaymentsClient();
@@ -221,8 +223,12 @@ class PaymentsClient {
   // The pref service for this client.
   PrefService* const pref_service_;
 
+  // Provided in constructor; not owned by PaymentsClient.
   identity::IdentityManager* const identity_manager_;
 
+  // Provided in constructor; not owned by PaymentsClient.
+  AccountInfoGetter* const account_info_getter_;
+
   // The current request.
   std::unique_ptr<PaymentsRequest> request_;
 
@@ -232,8 +238,8 @@ class PaymentsClient {
   // The URL loader being used to issue the current request.
   std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
 
-  // The current OAuth2 token fetcher.
-  std::unique_ptr<identity::PrimaryAccountAccessTokenFetcher> token_fetcher_;
+  // The OAuth2 token fetcher for any account.
+  std::unique_ptr<identity::AccessTokenFetcher> token_fetcher_;
 
   // The OAuth2 token, or empty if not fetched.
   std::string access_token_;

components/autofill/core/browser/payments/payments_client_unittest.cc

@@ -19,6 +19,7 @@
 #include "components/autofill/core/browser/credit_card_save_manager.h"
 #include "components/autofill/core/browser/local_card_migration_manager.h"
 #include "components/autofill/core/browser/payments/payments_client.h"
+#include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/autofill/core/common/autofill_features.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/prefs/pref_registry_simple.h"
@@ -73,9 +74,13 @@ class PaymentsClientTest : public testing::Test {
         base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
             &test_url_loader_factory_);
     TestingPrefServiceSimple pref_service_;
-    client_.reset(new PaymentsClient(test_shared_loader_factory_,
-                                     &pref_service_,
-                                     identity_test_env_.identity_manager()));
+    client_ = std::make_unique<PaymentsClient>(
+        test_shared_loader_factory_, &pref_service_,
+        identity_test_env_.identity_manager(), &test_personal_data_);
+    const std::string& account_id =
+        identity_test_env_.MakePrimaryAccountAvailable("[email protected]")
+            .account_id;
+    test_personal_data_.SetActiveAccountId(account_id);
   }
 
   void TearDown() override { client_.reset(); }
@@ -90,6 +95,11 @@ class PaymentsClientTest : public testing::Test {
         features::kAutofillSendExperimentIdsInPaymentsRPCs);
   }
 
+  void EnableAutofillGetPaymentsIdentityFromSync() {
+    scoped_feature_list_.InitAndEnableFeature(
+        features::kAutofillGetPaymentsIdentityFromSync);
+  }
+
   void DisableAutofillSendExperimentIdsInPaymentsRPCs() {
     scoped_feature_list_.InitAndDisableFeature(
         features::kAutofillSendExperimentIdsInPaymentsRPCs);
@@ -141,9 +151,6 @@ class PaymentsClientTest : public testing::Test {
   // Issue an UnmaskCard request. This requires an OAuth token before starting
   // the request.
   void StartUnmasking() {
-    if (!identity_test_env_.identity_manager()->HasPrimaryAccount())
-      identity_test_env_.MakePrimaryAccountAvailable("[email protected]");
-
     PaymentsClient::UnmaskRequestDetails request_details;
     request_details.billing_customer_number = 111222333444;
     request_details.card = test::GetMaskedServerCard();
@@ -156,9 +163,6 @@ class PaymentsClientTest : public testing::Test {
 
   // Issue a GetUploadDetails request.
   void StartGettingUploadDetails() {
-    if (!identity_test_env_.identity_manager()->HasPrimaryAccount())
-      identity_test_env_.MakePrimaryAccountAvailable("[email protected]");
-
     client_->GetUploadDetails(
         BuildTestProfiles(), kAllDetectableValues,
         /*pan_first_six=*/"411111", std::vector<const char*>(),
@@ -171,9 +175,6 @@ class PaymentsClientTest : public testing::Test {
   // Issue an UploadCard request. This requires an OAuth token before starting
   // the request.
   void StartUploading(bool include_cvc) {
-    if (!identity_test_env_.identity_manager()->HasPrimaryAccount())
-      identity_test_env_.MakePrimaryAccountAvailable("[email protected]");
-
     PaymentsClient::UploadRequestDetails request_details;
     request_details.billing_customer_number = 111222333444;
     request_details.card = test::GetCreditCard();
@@ -189,9 +190,6 @@ class PaymentsClientTest : public testing::Test {
   }
 
   void StartMigrating(bool uncheck_last_card, bool has_cardholder_name) {
-    if (!identity_test_env_.identity_manager()->HasPrimaryAccount())
-      identity_test_env_.MakePrimaryAccountAvailable("[email protected]");
-
     PaymentsClient::MigrationRequestDetails request_details;
     request_details.context_token = base::ASCIIToUTF16("context token");
     request_details.risk_data = "some risk data";
@@ -251,6 +249,7 @@ class PaymentsClientTest : public testing::Test {
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   network::TestURLLoaderFactory test_url_loader_factory_;
   scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
+  TestPersonalDataManager test_personal_data_;
   std::unique_ptr<PaymentsClient> client_;
   identity::IdentityTestEnvironment identity_test_env_;
 
@@ -319,6 +318,15 @@ TEST_F(PaymentsClientTest, UnmaskSuccess) {
   EXPECT_EQ("1234", real_pan_);
 }
 
+TEST_F(PaymentsClientTest, UnmaskSuccessAccountFromSyncTest) {
+  EnableAutofillGetPaymentsIdentityFromSync();
+  StartUnmasking();
+  IssueOAuthToken();
+  ReturnResponse(net::HTTP_OK, "{ \"pan\": \"1234\" }");
+  EXPECT_EQ(AutofillClient::SUCCESS, result_);
+  EXPECT_EQ("1234", real_pan_);
+}
+
 TEST_F(PaymentsClientTest, GetDetailsSuccess) {
   StartGettingUploadDetails();
   ReturnResponse(
@@ -361,6 +369,29 @@ TEST_F(PaymentsClientTest, GetDetailsIncludesDetectedValuesInRequest) {
               std::string::npos);
 }
 
+TEST_F(PaymentsClientTest, GetUploadAccountFromSyncTest) {
+  EnableAutofillGetPaymentsIdentityFromSync();
+  // Set up a different account.
+  const std::string& secondary_account_id =
+      identity_test_env_.MakeAccountAvailable("[email protected]").account_id;
+  test_personal_data_.SetActiveAccountId(secondary_account_id);
+
+  StartUploading(/*include_cvc=*/true);
+  ReturnResponse(net::HTTP_OK, "{}");
+
+  // Issue a token for the secondary account.
+  identity_test_env_.WaitForAccessTokenRequestIfNecessaryAndRespondWithToken(
+      secondary_account_id, "secondary_account_token",
+      base::Time::Now() + base::TimeDelta::FromDays(10));
+
+  // Verify the auth header.
+  std::string auth_header_value;
+  EXPECT_TRUE(intercepted_headers_.GetHeader(
+      net::HttpRequestHeaders::kAuthorization, &auth_header_value))
+      << intercepted_headers_.ToString();
+  EXPECT_EQ("Bearer secondary_account_token", auth_header_value);
+}
+
 TEST_F(PaymentsClientTest, GetUploadDetailsVariationsTest) {
   // Register a trial and variation id, so that there is data in variations
   // headers. Also, the variations header provider may have been registered to

components/autofill/core/browser/payments/payments_util.cc

@@ -23,7 +23,9 @@ int64_t GetBillingCustomerId(PersonalDataManager* personal_data_manager,
   DCHECK(pref_service);
 
   if (base::FeatureList::IsEnabled(
-          features::kAutofillUsePaymentsCustomerData)) {
+          features::kAutofillUsePaymentsCustomerData) ||
+      base::FeatureList::IsEnabled(
+          features::kAutofillEnableAccountWalletStorage)) {
     // Get billing customer ID from the synced PaymentsCustomerData.
     PaymentsCustomerData* customer_data =
         personal_data_manager->GetPaymentsCustomerData();

components/autofill/core/browser/payments/test_payments_client.cc

@@ -5,6 +5,7 @@
 #include "components/autofill/core/browser/payments/test_payments_client.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "components/autofill/core/browser/personal_data_manager.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
 namespace autofill {
@@ -13,8 +14,12 @@ namespace payments {
 TestPaymentsClient::TestPaymentsClient(
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_,
     PrefService* pref_service,
-    identity::IdentityManager* identity_manager)
-    : PaymentsClient(url_loader_factory_, pref_service, identity_manager) {}
+    identity::IdentityManager* identity_manager,
+    PersonalDataManager* personal_data_manager)
+    : PaymentsClient(url_loader_factory_,
+                     pref_service,
+                     identity_manager,
+                     personal_data_manager) {}
 
 TestPaymentsClient::~TestPaymentsClient() {}