Autofill: Add WalletIntegrationAvailable() to components.

chrome/browser/autofill/options_util.cc

Index: chrome/browser/autofill/options_util.cc
diff --git a/chrome/browser/autofill/options_util.cc b/chrome/browser/autofill/options_util.cc
index 389d40e44beeee39ddb5f535469fe67f4b4c8a45..e19b78f345187d6e21a80eaebabf0b6ccbaee26f 100644
--- a/chrome/browser/autofill/options_util.cc
+++ b/chrome/browser/autofill/options_util.cc
@@ -4,39 +4,18 @@
 
 #include "chrome/browser/autofill/options_util.h"
 
-#include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "components/autofill/core/browser/personal_data_manager.h"
-#include "components/autofill/core/common/autofill_pref_names.h"
+#include "components/autofill/core/browser/options_util.h"
 
 namespace autofill {
 
 bool WalletIntegrationAvailableForProfile(Profile* profile) {
-  ProfileSyncService* service =
-      ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
-  if (!(service && service->IsSyncEnabledAndLoggedIn() &&
-        service->GetPreferredDataTypes().Has(syncer::AUTOFILL_PROFILE))) {
-    return false;
-  }
-
-  PersonalDataManager* pdm = PersonalDataManagerFactory::GetForProfile(profile);
-  if (!pdm->IsExperimentalWalletIntegrationEnabled())
-    return false;
-
-  // If the user is signed in and the feature is enabled, but no data is being
-  // synced, hide the option. The user doesn't have a Wallet account. If the
-  // feature is disabled, we can't know, so show the checkbox.
-  if (!profile->GetPrefs()->GetBoolean(prefs::kAutofillWalletImportEnabled))

[Evan Stade, 2015/05/11 18:00:38]

you inverted this check

-    return true;
-
-  // If wallet is preferred but we haven't gotten the sync data yet, we don't
-  // know, so show the checkbox.
-  if (!service->GetActiveDataTypes().Has(syncer::AUTOFILL_WALLET_DATA))
-    return true;
-
-  return pdm->HasServerData();
+  return WalletIntegrationAvailable(
+      ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile),
+      *profile->GetPrefs(),
+      *PersonalDataManagerFactory::GetForProfile(profile));

[bondd, 2015/05/07 21:19:24]

LMK if you want me to DCHECK prefs and profile before dereferencing. In
codesearch it looks like a lot of other code assumes they're good without
DCHECKing, and as the code exists now GetPrefs() and GetForProfile() will both
always return valid data AFAICT. If I don't hear anything by the time the
trybots are done I'll go ahead and check the CQ bit.

[Evan Stade, 2015/05/07 21:23:02]

DCHECK is just documentation that you expect something to be valid. You
shouldn't DCHECK right before deref'ing because deref'ing provides that
documentation. (The DCHECK in the version where you were passing a pointer is
also explicitly discouraged in the Chrome style guide.)

 }
 
 }  // namespace autofill