Fixup Wallet sync.

1) Select the correct preference name for synced data type.
2) Set the correct field name when converting Wallet specifics to
   dictionary.

BUG=481595

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

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

components/sync_driver/sync_prefs.cc

@@ -252,9 +252,9 @@ const char* SyncPrefs::GetPrefNameForDataType(syncer::ModelType data_type) {
     case syncer::AUTOFILL:
       return prefs::kSyncAutofill;
     case syncer::AUTOFILL_PROFILE:
-      return prefs::kSyncAutofillWallet;
-    case syncer::AUTOFILL_WALLET_DATA:
       return prefs::kSyncAutofillProfile;
+    case syncer::AUTOFILL_WALLET_DATA:
+      return prefs::kSyncAutofillWallet;
     case syncer::THEMES:
       return prefs::kSyncThemes;
     case syncer::TYPED_URLS:
@@ -476,5 +476,3 @@ void SyncPrefs::SetCleanShutdown(bool value) {
 }
 
 }  // namespace sync_driver
-
-

sync/protocol/proto_value_conversions.cc

@@ -367,7 +367,7 @@ scoped_ptr<base::DictionaryValue> AutofillWalletSpecificsToValue(
     value->Set("masked_card",
                WalletMaskedCreditCardToValue(proto.masked_card()));
   } else if (proto.type() == sync_pb::AutofillWalletSpecifics::POSTAL_ADDRESS) {
-    value->Set("masked_card",
+    value->Set("address",
                WalletPostalAddressToValue(proto.address()));
   }
   return value;