Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feb98f1f authored by csagan5's avatar csagan5
Browse files

Draft for v90 patches

parent 4e0e82b3

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
89.0.4389.117
 
90.0.4430.55

build/bromite_patches_list.txt

+2 −4
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ AImageReader-CFI-crash-mitigations.patch 
Update-i18n-zh_CN-support.patch

Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch

Add-menu-item-to-view-source.patch

Enable-legacy-TLS-interstitital-warning.patch

Block-gateway-attacks-via-websockets.patch

Enable-prefetch-privacy-changes-by-default.patch

Disable-support-for-RAR-files-inspection.patch
@@ -125,12 +124,11 @@ Add-history-support-in-incognito-mode.patch 
Enable-darken-websites-checkbox-in-themes.patch

Remove-blocklisted-URLs-upon-bookmark-creation.patch

Disable-the-DIAL-repeating-discovery.patch

Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch

Block-qjz9zk-or-trk-requests.patch

Hardening-against-incognito-mode-detection.patch

Remove-weblayer-dependency-on-Play-Services.patch

Timezone-customization.patch

Move-some-account-settings-back-to-privacy-settings.patch

User-agent-customization.patch

Restore-Simplified-NTP-launch.patch

Revert-the-removal-of-an-option-to-block-autoplay.patch

Disable-text-fragments-by-default.patch
@@ -142,10 +140,10 @@ Disable-unified-autoplay-feature.patch 
Revert-flags-remove-num-raster-threads.patch

webview-Hard-no-to-persistent-histograms.patch

Ignore-enterprise-policies-for-secure-DNS.patch

Enable-app-overflow-menu-icons-by-default.patch

Add-menu-item-to-bookmark-all-tabs.patch

Add-flag-for-save-data-header.patch

Add-option-to-force-tablet-UI.patch

Make-all-favicon-requests-on-demand.patch

Add-Alt-D-hotkey-to-focus-address-bar.patch

Remove-offline-measurement-background-task.patch

Automated-domain-substitution.patch

build/patches/AImageReader-CFI-crash-mitigations.patch

+11 −11
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -1772,7 +1772,7 @@

@@ -1899,7 +1899,7 @@

   {

     "name": "enable-image-reader",

     "owners": [ "vikassoni", "liberato" ],
@@ -95,7 +95,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 
diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json

--- a/gpu/config/gpu_driver_bug_list.json

+++ b/gpu/config/gpu_driver_bug_list.json

@@ -3254,6 +3254,22 @@

@@ -3236,6 +3236,22 @@

         "dont_delete_source_texture_for_egl_image"

       ]

     },
@@ -121,7 +121,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis 
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc

--- a/gpu/config/gpu_finch_features.cc

+++ b/gpu/config/gpu_finch_features.cc

@@ -38,6 +38,11 @@ bool FieldIsInBlocklist(const char* current_value, std::string blocklist_str) {

@@ -49,6 +49,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) {

 }  // namespace

 

 #if defined(OS_ANDROID)
@@ -143,11 +143,11 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h 
+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;

 GPU_EXPORT extern const base::Feature kUseGles2ForOopR;

 GPU_EXPORT extern const base::Feature kAndroidSurfaceControl;

 GPU_EXPORT extern const base::Feature kAImageReader;

 GPU_EXPORT extern const base::Feature kWebViewSurfaceControl;

diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc

--- a/gpu/config/gpu_util.cc

+++ b/gpu/config/gpu_util.cc

@@ -111,6 +111,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

@@ -112,6 +112,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

 #if !defined(OS_ANDROID)

   return kGpuFeatureStatusDisabled;

 #else
@@ -157,7 +157,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc 
   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

 

@@ -316,6 +319,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

@@ -317,6 +320,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

     gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =

         kGpuFeatureStatusBlocklisted;

   }
@@ -178,12 +178,12 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list 
 disable_accelerated_av1_decode

+disable_aimagereader

 disable_accelerated_av1_decode_d3d11

 disable_accelerated_h264_encode

 disable_accelerated_vp8_decode

 disable_accelerated_vp8_encode

diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc

--- a/gpu/ipc/service/gpu_init.cc

+++ b/gpu/ipc/service/gpu_init.cc

@@ -477,6 +477,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -488,6 +488,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

     }

   }
@@ -206,7 +206,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ 
 #include "base/android/scoped_hardware_buffer_fence_sync.h"

 #include "base/bind.h"

 #include "base/feature_list.h"

@@ -48,7 +49,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(

@@ -49,7 +50,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(

 }

 

 TextureOwner::Mode GetTextureOwnerMode() {
@@ -226,7 +226,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ 
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc

--- a/media/base/media_switches.cc

+++ b/media/base/media_switches.cc

@@ -604,6 +604,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",

@@ -620,6 +620,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",

 const base::Feature kMediaDrmPreprovisioningAtStartup{

     "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -240,7 +240,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc 
diff --git a/media/base/media_switches.h b/media/base/media_switches.h

--- a/media/base/media_switches.h

+++ b/media/base/media_switches.h

@@ -206,6 +206,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture;

@@ -210,6 +210,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture;

 MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense;

 MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning;

 MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup;

build/patches/AV1-codec-support.patch

+27 −27
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn 
       include_dirs = libaom_include_dirs

     }

 

@@ -184,7 +184,7 @@ if (enable_libaom) {

@@ -192,7 +192,7 @@ if (enable_libaom) {

       configs += [ "//build/config/compiler:no_chromium_code" ]

       if (current_cpu == "arm") {

         configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
@@ -42,7 +42,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn 
       }

       configs += [ ":libaom_config" ]

 

@@ -233,6 +233,8 @@ if (enable_libaom) {

@@ -242,6 +242,8 @@ if (enable_libaom) {

     if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||

         cpu_arch_full == "arm-neon-cpu-detect") {

       deps += [ ":libaom_intrinsics_neon" ]
@@ -54,7 +54,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn 
diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni

--- a/third_party/libaom/libaom_srcs.gni

+++ b/third_party/libaom/libaom_srcs.gni

@@ -616,6 +616,11 @@ aom_mem_sources = [

@@ -629,6 +629,11 @@ aom_mem_sources = [

 

 aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]
@@ -69,7 +69,7 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs 
diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0

@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_OPTICAL_FLOW_API equ 0

 CONFIG_OS_SUPPORT equ 1
@@ -77,11 +77,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a 
+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REALTIME_ONLY equ 1

 CONFIG_RUNTIME_CPU_DETECT equ 1

 CONFIG_RT_ML_PARTITIONING equ 0

diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h

@@ -47,7 +47,7 @@

@@ -48,7 +48,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_OPTICAL_FLOW_API 0

 #define CONFIG_OS_SUPPORT 1
@@ -89,11 +89,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a 
+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REALTIME_ONLY 1

 #define CONFIG_RUNTIME_CPU_DETECT 1

 #define CONFIG_RT_ML_PARTITIONING 0

diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0

@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_OPTICAL_FLOW_API equ 0

 CONFIG_OS_SUPPORT equ 1
@@ -101,11 +101,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a 
+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REALTIME_ONLY equ 1

 CONFIG_RUNTIME_CPU_DETECT equ 0

 CONFIG_RT_ML_PARTITIONING equ 0

diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h

@@ -47,7 +47,7 @@

@@ -48,7 +48,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_OPTICAL_FLOW_API 0

 #define CONFIG_OS_SUPPORT 1
@@ -113,11 +113,11 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h 
+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REALTIME_ONLY 1

 #define CONFIG_RUNTIME_CPU_DETECT 0

 #define CONFIG_RT_ML_PARTITIONING 0

diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0

@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_OPTICAL_FLOW_API equ 0

 CONFIG_OS_SUPPORT equ 1
@@ -125,11 +125,11 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ 
+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REALTIME_ONLY equ 1

 CONFIG_RUNTIME_CPU_DETECT equ 0

 CONFIG_RT_ML_PARTITIONING equ 0

diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h

@@ -47,7 +47,7 @@

@@ -48,7 +48,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_OPTICAL_FLOW_API 0

 #define CONFIG_OS_SUPPORT 1
@@ -137,11 +137,11 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th 
+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REALTIME_ONLY 1

 #define CONFIG_RUNTIME_CPU_DETECT 0

 #define CONFIG_RT_ML_PARTITIONING 0

diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0

@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_OPTICAL_FLOW_API equ 0

 CONFIG_OS_SUPPORT equ 1
@@ -149,11 +149,11 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm 
+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REALTIME_ONLY equ 1

 CONFIG_RUNTIME_CPU_DETECT equ 0

 CONFIG_RT_ML_PARTITIONING equ 0

diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h

@@ -47,7 +47,7 @@

@@ -48,7 +48,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_OPTICAL_FLOW_API 0

 #define CONFIG_OS_SUPPORT 1
@@ -161,11 +161,11 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ 
+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REALTIME_ONLY 1

 #define CONFIG_RUNTIME_CPU_DETECT 0

 #define CONFIG_RT_ML_PARTITIONING 0

diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_NN_V2 equ 0

@@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_OPTICAL_FLOW_API equ 0

 CONFIG_OS_SUPPORT equ 1
@@ -173,11 +173,11 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as 
+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REALTIME_ONLY equ 1

 CONFIG_RUNTIME_CPU_DETECT equ 1

 CONFIG_RT_ML_PARTITIONING equ 0

diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h

--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h

@@ -47,7 +47,7 @@

@@ -48,7 +48,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_OPTICAL_FLOW_API 0

 #define CONFIG_OS_SUPPORT 1
@@ -185,11 +185,11 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h 
+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REALTIME_ONLY 1

 #define CONFIG_RUNTIME_CPU_DETECT 1

 #define CONFIG_RT_ML_PARTITIONING 0

diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm

@@ -35,7 +35,7 @@

@@ -36,7 +36,7 @@

 %define CONFIG_NORMAL_TILE_MODE 1

 %define CONFIG_OPTICAL_FLOW_API 0

 %define CONFIG_OS_SUPPORT 1
@@ -197,11 +197,11 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ 
+%define CONFIG_PIC 1

 %define CONFIG_RD_DEBUG 0

 %define CONFIG_REALTIME_ONLY 1

 %define CONFIG_RUNTIME_CPU_DETECT 1

 %define CONFIG_RT_ML_PARTITIONING 0

diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h

--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h

@@ -47,7 +47,7 @@

@@ -48,7 +48,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_OPTICAL_FLOW_API 0

 #define CONFIG_OS_SUPPORT 1
@@ -209,7 +209,7 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th 
+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REALTIME_ONLY 1

 #define CONFIG_RUNTIME_CPU_DETECT 1

 #define CONFIG_RT_ML_PARTITIONING 0

-- 

2.17.1

build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch

+6 −6
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ See also: 
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -3040,6 +3040,12 @@ const FeatureEntry kFeatureEntries[] = {

      FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)},

@@ -3100,6 +3100,12 @@ const FeatureEntry kFeatureEntries[] = {

      FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)},

 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)

 

+#if defined(OS_ANDROID)
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc

--- a/chrome/browser/flag_descriptions.cc

+++ b/chrome/browser/flag_descriptions.cc

@@ -533,6 +533,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] =

@@ -589,6 +589,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] =

     "authenticator (if available) to verify card ownership when retrieving "

     "credit cards from Google Payments.";
@@ -48,7 +48,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti 
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h

--- a/chrome/browser/flag_descriptions.h

+++ b/chrome/browser/flag_descriptions.h

@@ -329,6 +329,9 @@ extern const char kEnableAutofillAccountWalletStorageDescription[];

@@ -362,6 +362,9 @@ extern const char kEnableAutofillAddressSavePromptDescription[];

 

 extern const char kEnableAutofillCreditCardAblationExperimentDisplayName[];

 extern const char kEnableAutofillCreditCardAblationExperimentDescription[];
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmp 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc

--- a/chrome/common/chrome_switches.cc

+++ b/chrome/common/chrome_switches.cc

@@ -334,6 +334,9 @@ const char kHomePage[]                      = "homepage";

@@ -326,6 +326,9 @@ const char kHomePage[]                      = "homepage";

 // Causes the browser to launch directly in incognito mode.

 const char kIncognito[]                     = "incognito";
@@ -88,7 +88,7 @@ diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h

--- a/chrome/common/chrome_switches.h

+++ b/chrome/common/chrome_switches.h

@@ -113,6 +113,7 @@ extern const char kForceFirstRun[];

@@ -111,6 +111,7 @@ extern const char kForceFirstRun[];

 extern const char kForceStackedTabStripLayout[];

 extern const char kHomePage[];

 extern const char kIncognito[];