[AF] Add feature to always show server cards in sync transport mode.

Bug: 907929
Change-Id: I5327254e20e4e6bbbfd0d8fc35d24e1dd5814917
Reviewed-on: https://chromium-review.googlesource.com/c/1366374
Reviewed-by: Elly Fong-Jones <[email protected]>
Reviewed-by: Fabio Tirelo <[email protected]>
Commit-Queue: Sebastien Seguin-Gagnon <[email protected]>
Cr-Commit-Position: refs/heads/master@{#614726}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index c85f750..9de6a35 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4421,6 +4421,16 @@
      flag_descriptions::kForceEnableSystemAecDescription, kOsMac | kOsCrOS,
      FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
 #endif  // defined(OS_MACOSX) || defined(OS_CHROMEOS)
+
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+    {"autofill-always-show-server-cards-in-sync-transport",
+     flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
+     flag_descriptions::
+         kAutofillAlwaysShowServerCardsInSyncTransportDescription,
+     kOsMac | kOsWin | kOsLinux,
+     FEATURE_VALUE_TYPE(
+         autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 };
 
 class FlagsStateSingleton {
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index cf74dd38..10ee3ff 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -232,6 +232,11 @@
     "expiry_milestone": 76
   },
   {
+    "name": "autofill-always-show-server-cards-in-sync-transport",
+    "owners": [ "sebsg" ],
+    "expiry_milestone": 74
+  },
+  {
     "name": "autofill-cache-query-responses",
     "owners": [ "rogerm" ],
     "expiry_milestone": 72
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 2cedf59..6f04387 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -88,6 +88,11 @@
 const char kAsyncImageDecodingDescription[] =
     "Enables asynchronous decoding of images from raster for web content";
 
+extern const char kAutofillAlwaysShowServerCardsInSyncTransportName[] =
+    "AlwaysShowServerCardsInSyncTransport";
+extern const char kAutofillAlwaysShowServerCardsInSyncTransportDescription[] =
+    "Always show server cards when in sync transport mode for wallet data";
+
 const char kAutofillCacheQueryResponsesName[] =
     "Cache Autofill Query Responses";
 const char kAutofillCacheQueryResponsesDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 973a672..0003a03 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -80,6 +80,9 @@
 extern const char kAsyncImageDecodingName[];
 extern const char kAsyncImageDecodingDescription[];
 
+extern const char kAutofillAlwaysShowServerCardsInSyncTransportName[];
+extern const char kAutofillAlwaysShowServerCardsInSyncTransportDescription[];
+
 extern const char kAutofillCacheQueryResponsesName[];
 extern const char kAutofillCacheQueryResponsesDescription[];