more patches added

2023-11-24 15:00:20 +01:00
parent 6c36a087f6
commit b4fc6f76c8
44 changed files with 1140 additions and 1893 deletions
@@ -14,48 +14,78 @@ Currently in wip
 Need: bromite-build-utils.patch
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- base/BUILD.gn                                 |  4 +-
- base/feature_list.cc                          | 56 +++++++++++++
- base/feature_list.h                           | 84 ++++++++++++++++++-
- build/android/gyp/java_cpp_features.py        | 17 ++++
- chrome/android/java/res/values/values.xml     |  3 +
- .../java/res/xml/privacy_preferences.xml      |  4 +
- chrome/browser/about_flags.cc                 |  7 ++
- .../flags/android/chrome_feature_list.cc      |  1 +
- chrome/browser/ui/ui_features.cc              |  1 +
- chrome/common/chrome_features.cc              |  1 +
- components/flags_ui/flags_state.cc            | 21 +++++
- components/flags_ui/resources/experiment.html |  7 +-
- components/flags_ui/resources/experiment.ts   | 16 ++++
- components/flags_ui/resources/flags.css       | 19 +++++
- components/flags_ui/resources/flags.html      | 13 +++
- components/flags_ui/resources/flags.ts        | 36 ++++++--
- .../flags_ui/resources/flags_browser_proxy.ts |  5 ++
- content/common/features.cc                    |  1 +
- content/public/common/content_features.cc     |  1 +
- content/public/common/content_features.h      |  1 +
- cromite_flags/BUILD.gn                        | 72 ++++++++++++++++
- .../browser/about_flags_cc/placeholder.txt    |  1 +
- .../chrome_feature_list_cc/placeholder.txt    |  1 +
- .../browser/ui/ui_features_cc/placeholder.txt |  1 +
- .../common/chrome_features_cc/placeholder.txt |  1 +
- .../common/chrome_features_h/placeholder.txt  |  1 +
- .../common/features_cc/placeholder.txt        |  1 +
- .../content_features_cc/placeholder.txt       |  1 +
- .../common/content_features_h/placeholder.txt |  1 +
- .../blink/common/features_cc/placeholder.txt  |  1 +
- third_party/blink/common/features.cc          |  1 +
- 31 files changed, 370 insertions(+), 10 deletions(-)
+ base/BUILD.gn                                 |   4 +-
+ base/feature_list.cc                          |  56 ++++++++
+ base/feature_list.h                           |  84 ++++++++++-
+ build/android/gyp/java_cpp_features.py        |  17 +++
+ chrome/android/java/res/values/values.xml     |   3 +
+ .../java/res/xml/privacy_preferences.xml      |   4 +
+ chrome/browser/about_flags.cc                 |   7 +
+ .../flags/android/chrome_feature_list.cc      |   1 +
+ .../flags/android/chrome_feature_list.h       |   1 +
+ chrome/browser/ui/ui_features.cc              |   1 +
+ chrome/common/chrome_features.cc              |   1 +
+ .../content_settings/core/common/features.cc  |   1 +
+ components/flags_ui/flags_state.cc            |  21 +++
+ components/flags_ui/resources/experiment.html |   7 +-
+ components/flags_ui/resources/experiment.ts   |  16 +++
+ components/flags_ui/resources/flags.css       |  19 +++
+ components/flags_ui/resources/flags.html      |  13 ++
+ components/flags_ui/resources/flags.ts        |  36 ++++-
+ .../flags_ui/resources/flags_browser_proxy.ts |   5 +
+ .../core/offline_page_feature.cc              |   1 +
+ .../offline_pages/core/offline_page_feature.h |   1 +
+ components/permissions/features.cc            |   1 +
+ content/common/features.cc                    |   1 +
+ content/public/common/content_features.cc     |   1 +
+ content/public/common/content_features.h      |   1 +
+ cromite_flags/BUILD.gn                        | 132 ++++++++++++++++++
+ .../browser/about_flags_cc/placeholder.txt    |   1 +
+ .../chrome_feature_list_cc/placeholder.txt    |   1 +
+ .../chrome_feature_list_h/placeholder.txt     |   1 +
+ .../browser/ui/ui_features_cc/placeholder.txt |   1 +
+ .../common/chrome_features_cc/placeholder.txt |   1 +
+ .../common/chrome_features_h/placeholder.txt  |   1 +
+ .../core/common/features_cc/placeholder.txt   |   1 +
+ .../offline_page_feature_cc/placeholder.txt   |   1 +
+ .../offline_page_feature_h/placeholder.txt    |   1 +
+ .../permissions/features_cc/placeholder.txt   |   1 +
+ .../common/features_cc/placeholder.txt        |   1 +
+ .../content_features_cc/placeholder.txt       |   1 +
+ .../common/content_features_h/placeholder.txt |   1 +
+ .../base/media_switches_cc/placeholder.txt    |   1 +
+ .../base/media_switches_h/placeholder.txt     |   1 +
+ .../net/base/features_cc/placeholder.txt      |   1 +
+ .../net/base/features_h/placeholder.txt       |   1 +
+ .../blink/common/features_cc/placeholder.txt  |   1 +
+ .../blink/common/features_h/placeholder.txt   |   1 +
+ media/base/media_switches.cc                  |   2 +-
+ media/base/media_switches.h                   |   2 +-
+ net/base/features.cc                          |   1 +
+ net/base/features.h                           |   1 +
+ third_party/blink/common/features.cc          |   1 +
+ third_party/blink/public/common/features.h    |   1 +
+ 51 files changed, 450 insertions(+), 12 deletions(-)
 create mode 100755 cromite_flags/BUILD.gn
 create mode 100755 cromite_flags/chrome/browser/about_flags_cc/placeholder.txt
 create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt
+ create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/placeholder.txt
 create mode 100755 cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt
 create mode 100755 cromite_flags/chrome/common/chrome_features_cc/placeholder.txt
 create mode 100755 cromite_flags/chrome/common/chrome_features_h/placeholder.txt
+ create mode 100755 cromite_flags/components/content_settings/core/common/features_cc/placeholder.txt
+ create mode 100755 cromite_flags/components/offline_pages/core/offline_page_feature_cc/placeholder.txt
+ create mode 100755 cromite_flags/components/offline_pages/core/offline_page_feature_h/placeholder.txt
+ create mode 100755 cromite_flags/components/permissions/features_cc/placeholder.txt
 create mode 100755 cromite_flags/content/common/features_cc/placeholder.txt
 create mode 100755 cromite_flags/content/public/common/content_features_cc/placeholder.txt
 create mode 100755 cromite_flags/content/public/common/content_features_h/placeholder.txt
+ create mode 100755 cromite_flags/media/base/media_switches_cc/placeholder.txt
+ create mode 100755 cromite_flags/media/base/media_switches_h/placeholder.txt
+ create mode 100755 cromite_flags/net/base/features_cc/placeholder.txt
+ create mode 100755 cromite_flags/net/base/features_h/placeholder.txt
 create mode 100755 cromite_flags/third_party/blink/common/features_cc/placeholder.txt
+ create mode 100755 cromite_flags/third_party/blink/common/features_h/placeholder.txt

 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
@@ -332,7 +362,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 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
-@@ -4096,6 +4096,10 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = {
+@@ -4091,6 +4091,10 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = {
      nullptr}};
 #endif  // BUILDFLAG(IS_ANDROID)
 
@@ -343,7 +373,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the entry is the internal name.
-@@ -4122,6 +4126,9 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = {
+@@ -4117,6 +4121,9 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = {
 const FeatureEntry kFeatureEntries[] = {
 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
 // //tools/flags/generate_unexpire_flags.py.
@@ -356,13 +386,24 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -1244,5 +1244,6 @@ BASE_FEATURE(kBookmarksExportUseSaf,
-              "BookmarksExportUseSaf",
+@@ -1223,5 +1223,6 @@ BASE_FEATURE(kWebApkInstallService,
+              "WebApkInstallService",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc"
 }  // namespace android
 }  // namespace chrome
+diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
+--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
+@@ -232,6 +232,7 @@ constexpr base::FeatureParam<int> kAuxiliarySearchMaxTabsCountParam(
+     "auxiliary_search_max_donation_tab",
+     100);
+ 
+#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_h.inc"
+ }  // namespace android
+ }  // namespace chrome
+ 
 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
@@ -375,12 +416,22 @@ diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -1649,4 +1649,5 @@ BASE_FEATURE(kSupportsRtcWakeOver24Hours,
+@@ -1653,4 +1653,5 @@ BASE_FEATURE(kSupportsRtcWakeOver24Hours,
              base::FEATURE_ENABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 +#include "cromite_flags/chrome_common_chrome_features_cc.inc"
 }  // namespace features
+diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc
+--- a/components/content_settings/core/common/features.cc
+++ b/components/content_settings/core/common/features.cc
+@@ -82,5 +82,6 @@ BASE_FEATURE(kTrackingProtection3pcd,
+              "TrackingProtection3pcd",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+#include "cromite_flags/components_content_settings_core_common_features_cc.inc"
+ }  // namespace features
+ }  // namespace content_settings
 diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_state.cc
 --- a/components/flags_ui/flags_state.cc
 +++ b/components/flags_ui/flags_state.cc
@@ -666,6 +717,37 @@ diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/f
   supported_platforms: string[];
   origin_list_value?: string;
   string_value?: string;
+diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
+--- a/components/offline_pages/core/offline_page_feature.cc
+++ b/components/offline_pages/core/offline_page_feature.cc
+@@ -82,4 +82,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() {
+   return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown);
+ }
+ 
+#include "cromite_flags/components_offline_pages_core_offline_page_feature_cc.inc"
+ }  // namespace offline_pages
+diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
+--- a/components/offline_pages/core/offline_page_feature.h
+++ b/components/offline_pages/core/offline_page_feature.h
+@@ -64,6 +64,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled();
+ // offline pages to avoid showing them even when the device is online.
+ bool IsOfflinePagesNetworkStateLikelyUnknown();
+ 
+#include "cromite_flags/components_offline_pages_core_offline_page_feature_h.inc"
+ }  // namespace offline_pages
+ 
+ #endif  // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_FEATURE_H_
+diff --git a/components/permissions/features.cc b/components/permissions/features.cc
+--- a/components/permissions/features.cc
+++ b/components/permissions/features.cc
+@@ -171,6 +171,7 @@ BASE_FEATURE(kBlockMidiByDefault,
+              "BlockMidiByDefault",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+#include "cromite_flags/components_permissions_features_cc.inc"
+ }  // namespace features
+ namespace feature_params {
+ 
 diff --git a/content/common/features.cc b/content/common/features.cc
 --- a/content/common/features.cc
 +++ b/content/common/features.cc
@@ -678,7 +760,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -1331,4 +1331,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
+@@ -1321,4 +1321,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
          VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
 }
 
@@ -687,7 +769,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -330,6 +330,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);
+@@ -327,6 +327,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);
 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
 
@@ -699,7 +781,7 @@ diff --git a/cromite_flags/BUILD.gn b/cromite_flags/BUILD.gn
 new file mode 100755
 --- /dev/null
 +++ b/cromite_flags/BUILD.gn
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,132 @@
 +# This file is part of Bromite.
 +
 +# Bromite is free software: you can redistribute it and/or modify
@@ -750,26 +832,86 @@ new file mode 100755
 +  output_file = "third_party_blink_common_features_cc.inc"
 +}
 +
+cpp_bromite_include("third_party_blink_common_features_h") {
+  inputs = [ "//cromite_flags/third_party/blink/common/features_h/placeholder.txt" ]
+  output_file = "third_party_blink_common_features_h.inc"
+}
+
 +cpp_bromite_include("chrome_browser_flags_android_chrome_feature_list_cc") {
 +  inputs = [ "//cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt" ]
 +  output_file = "chrome_browser_flags_android_chrome_feature_list_cc.inc"
 +}
 +
+cpp_bromite_include("chrome_browser_flags_android_chrome_feature_list_h") {
+  inputs = [ "//cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/placeholder.txt" ]
+  output_file = "chrome_browser_flags_android_chrome_feature_list_h.inc"
+}
+
 +cpp_bromite_include("chrome_browser_ui_ui_features_cc") {
 +  inputs = [ "//cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt" ]
 +  output_file = "chrome_browser_ui_ui_features_cc.inc"
 +}
 +
+cpp_bromite_include("media_base_media_switches_cc") {
+  inputs = [ "//cromite_flags/media/base/media_switches_cc/placeholder.txt" ]
+  output_file = "media_base_media_switches_cc.inc"
+}
+
+cpp_bromite_include("media_base_media_switches_h") {
+  inputs = [ "//cromite_flags/media/base/media_switches_h/placeholder.txt" ]
+  output_file = "media_base_media_switches_h.inc"
+}
+
+cpp_bromite_include("components_content_settings_core_common_features_cc") {
+  inputs = [ "//cromite_flags/components/content_settings/core/common/features_cc/placeholder.txt" ]
+  output_file = "components_content_settings_core_common_features_cc.inc"
+}
+
+cpp_bromite_include("components_permissions_features_cc") {
+  inputs = [ "//cromite_flags/components/permissions/features_cc/placeholder.txt" ]
+  output_file = "components_permissions_features_cc.inc"
+}
+
+cpp_bromite_include("components_offline_pages_core_offline_page_feature_cc") {
+  inputs = [ "//cromite_flags/components/offline_pages/core/offline_page_feature_cc/placeholder.txt" ]
+  output_file = "components_offline_pages_core_offline_page_feature_cc.inc"
+}
+
+cpp_bromite_include("components_offline_pages_core_offline_page_feature_h") {
+  inputs = [ "//cromite_flags/components/offline_pages/core/offline_page_feature_h/placeholder.txt" ]
+  output_file = "components_offline_pages_core_offline_page_feature_h.inc"
+}
+
+cpp_bromite_include("net_base_features_cc") {
+  inputs = [ "//cromite_flags/net/base/features_cc/placeholder.txt" ]
+  output_file = "net_base_features_cc.inc"
+}
+
+cpp_bromite_include("net_base_features_h") {
+  inputs = [ "//cromite_flags/net/base/features_h/placeholder.txt" ]
+  output_file = "net_base_features_h.inc"
+}
+
 +component("cromite_flags") {
 +  deps = [
 +    ":content_common_features_cc",
 +    ":content_public_common_content_features_cc",
 +    ":content_public_common_content_features_h",
+    ":components_content_settings_core_common_features_cc",
+    ":components_permissions_features_cc",
+    ":components_offline_pages_core_offline_page_feature_cc",
+    ":components_offline_pages_core_offline_page_feature_h",
+    ":media_base_media_switches_cc",
+    ":media_base_media_switches_h",
+    ":net_base_features_cc",
+    ":net_base_features_h",
 +    ":chrome_common_chrome_features_cc",
 +    ":chrome_browser_about_flags_cc",
 +    ":chrome_browser_flags_android_chrome_feature_list_cc",
+    ":chrome_browser_flags_android_chrome_feature_list_h",
 +    ":chrome_browser_ui_ui_features_cc",
 +    ":third_party_blink_common_features_cc",
+    ":third_party_blink_common_features_h",
 +  ]
 +}
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/placeholder.txt b/cromite_flags/chrome/browser/about_flags_cc/placeholder.txt
@@ -784,6 +926,12 @@ new file mode 100755
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt
@@ -0,0 +1 @@
 +this file is intentionally empty
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/placeholder.txt b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
 diff --git a/cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt b/cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt
 new file mode 100755
 --- /dev/null
@@ -802,6 +950,30 @@ new file mode 100755
 +++ b/cromite_flags/chrome/common/chrome_features_h/placeholder.txt
@@ -0,0 +1 @@
 +this file is intentionally empty
+diff --git a/cromite_flags/components/content_settings/core/common/features_cc/placeholder.txt b/cromite_flags/components/content_settings/core/common/features_cc/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/components/content_settings/core/common/features_cc/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
+diff --git a/cromite_flags/components/offline_pages/core/offline_page_feature_cc/placeholder.txt b/cromite_flags/components/offline_pages/core/offline_page_feature_cc/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/components/offline_pages/core/offline_page_feature_cc/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
+diff --git a/cromite_flags/components/offline_pages/core/offline_page_feature_h/placeholder.txt b/cromite_flags/components/offline_pages/core/offline_page_feature_h/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/components/offline_pages/core/offline_page_feature_h/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
+diff --git a/cromite_flags/components/permissions/features_cc/placeholder.txt b/cromite_flags/components/permissions/features_cc/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/components/permissions/features_cc/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
 diff --git a/cromite_flags/content/common/features_cc/placeholder.txt b/cromite_flags/content/common/features_cc/placeholder.txt
 new file mode 100755
 --- /dev/null
@@ -820,21 +992,102 @@ new file mode 100755
 +++ b/cromite_flags/content/public/common/content_features_h/placeholder.txt
@@ -0,0 +1 @@
 +this file is intentionally empty
+diff --git a/cromite_flags/media/base/media_switches_cc/placeholder.txt b/cromite_flags/media/base/media_switches_cc/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/media/base/media_switches_cc/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
+diff --git a/cromite_flags/media/base/media_switches_h/placeholder.txt b/cromite_flags/media/base/media_switches_h/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/media/base/media_switches_h/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
+diff --git a/cromite_flags/net/base/features_cc/placeholder.txt b/cromite_flags/net/base/features_cc/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/net/base/features_cc/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
+diff --git a/cromite_flags/net/base/features_h/placeholder.txt b/cromite_flags/net/base/features_h/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/net/base/features_h/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
 diff --git a/cromite_flags/third_party/blink/common/features_cc/placeholder.txt b/cromite_flags/third_party/blink/common/features_cc/placeholder.txt
 new file mode 100755
 --- /dev/null
 +++ b/cromite_flags/third_party/blink/common/features_cc/placeholder.txt
@@ -0,0 +1 @@
 +this file is intentionally empty
+diff --git a/cromite_flags/third_party/blink/common/features_h/placeholder.txt b/cromite_flags/third_party/blink/common/features_h/placeholder.txt
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_h/placeholder.txt
+@@ -0,0 +1 @@
+this file is intentionally empty
+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
+@@ -1743,5 +1743,5 @@ uint32_t GetPassthroughAudioFormats() {
+   return 0;
+ #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
+ }
+-
+#include "cromite_flags/media_base_media_switches_cc.inc"
+ }  // namespace media
+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
+@@ -505,5 +505,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
+ MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
+ 
+ }  // namespace media
+-
+#include "cromite_flags/media_base_media_switches_h.inc"
+ #endif  // MEDIA_BASE_MEDIA_SWITCHES_H_
+diff --git a/net/base/features.cc b/net/base/features.cc
+--- a/net/base/features.cc
+++ b/net/base/features.cc
+@@ -480,4 +480,5 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseVerifyCorrectness,
+              "SpdyHeadersToHttpResponseVerifyCorrectness",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+#include "cromite_flags/net_base_features_cc.inc"
+ }  // namespace net::features
+diff --git a/net/base/features.h b/net/base/features.h
+--- a/net/base/features.h
+++ b/net/base/features.h
+@@ -475,6 +475,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder);
+ // for two weeks on Dev.
+ NET_EXPORT BASE_DECLARE_FEATURE(kSpdyHeadersToHttpResponseVerifyCorrectness);
+ 
+#include "cromite_flags/net_base_features_h.inc"
+ }  // namespace net::features
+ 
+ #endif  // NET_BASE_FEATURES_H_
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -2192,5 +2192,6 @@ bool IsKeepAliveURLLoaderServiceEnabled() {
+@@ -2187,5 +2187,6 @@ bool IsKeepAliveURLLoaderServiceEnabled() {
          base::FeatureList::IsEnabled(kFetchLaterAPI);
 }
 
 +#include "cromite_flags/third_party_blink_common_features_cc.inc"
 }  // namespace features
 }  // namespace blink
+diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
+--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
+@@ -1399,6 +1399,7 @@ BLINK_COMMON_EXPORT bool IsKeepAliveURLLoaderServiceEnabled();
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(
+     kRemoveAuthroizationOnCrossOriginRedirect);
+ 
+#include "cromite_flags/third_party_blink_common_features_h.inc"
+ }  // namespace features
+ }  // namespace blink
+ 
 --
 2.25.1
@@ -4,24 +4,15 @@ Subject: Disable BackForwardCache

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- content/public/common/content_features.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ .../common/content_features_cc/Disable-BackForwardCache.inc      | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-BackForwardCache.inc

-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -65,9 +65,9 @@ BASE_FEATURE(kBackgroundFetch,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
- // Enable using the BackForwardCache.
-BASE_FEATURE(kBackForwardCache,
-             "BackForwardCache",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kBackForwardCache,                   // ****
-+             "BackForwardCache",                  // always disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in bromite
- 
- // Enable showing a page preview during back/forward navigations.
- BASE_FEATURE(kBackForwardTransitions,
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-BackForwardCache.inc b/cromite_flags/content/public/common/content_features_cc/Disable-BackForwardCache.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-BackForwardCache.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kBackForwardCache);
 --
 2.25.1
@@ -4,34 +4,17 @@ Subject: Disable FedCm

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- content/public/common/content_features.cc                   | 6 +++---
- .../blink/renderer/platform/runtime_enabled_features.json5  | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ .../content/public/common/content_features_cc/Disable-FedCm.inc | 1 +
+ .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc

-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -337,7 +337,7 @@ BASE_FEATURE(kEnableServiceWorkersForChromeScheme,
- // by the flag in RuntimeEnabledFeatures on the blink side. See also
- // the use of kSetOnlyIfOverridden in content/child/runtime_features.cc.
- // We enable it here by default to support use in origin trials.
-BASE_FEATURE(kFedCm, "FedCm", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kFedCm, "FedCm", base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // Field trial boolean parameter which indicates whether FedCM IDP sign-out
- // is enabled.
-@@ -385,9 +385,9 @@ BASE_FEATURE(kFedCmSelectiveDisclosure,
- 
- // Enables the IDP signin status API for use with FedCM, including avoiding
- // network requests when not signed in and mismatch handling.
-BASE_FEATURE(kFedCmIdpSigninStatusEnabled,          // disabled
-+BASE_FEATURE(kFedCmIdpSigninStatusEnabled,          // enabled
-              "FedCmIdpSigninStatusEnabled",         // by default
-             base::FEATURE_DISABLED_BY_DEFAULT);    // on bromite
-+             base::FEATURE_ENABLED_BY_DEFAULT);     // on bromite
- 
- // Enables bypassing the well-known file enforcement.
- BASE_FEATURE(kFedCmWithoutWellKnownEnforcement,
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kFedCm);
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -4,10 +4,11 @@ Subject: Disable FirstPartySets and StorageAccessAPI

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- components/privacy_sandbox/privacy_sandbox_prefs.cc     | 2 +-
- components/privacy_sandbox/tracking_protection_prefs.cc | 4 ++--
- content/public/common/content_features.cc               | 6 +++---
- 3 files changed, 6 insertions(+), 6 deletions(-)
+ components/privacy_sandbox/privacy_sandbox_prefs.cc           | 2 +-
+ components/privacy_sandbox/tracking_protection_prefs.cc       | 4 ++--
+ .../Disable-FirstPartySets-and-StorageAccessAPI.inc           | 1 +
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FirstPartySets-and-StorageAccessAPI.inc

 diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
 --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -40,21 +41,11 @@ diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/component
   registry->RegisterBooleanPref(
       prefs::kEnableDoNotTrack, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -405,9 +405,9 @@ BASE_FEATURE(kWebIdentityMDocs,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // Enables usage of First Party Sets to determine cookie availability.
-BASE_FEATURE(kFirstPartySets,
-             "FirstPartySets",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kFirstPartySets,                       // always
-+             "FirstPartySets",                      // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in bromite
- 
- // Controls whether to clear sites data on FPS transitions.
- const base::FeatureParam<bool> kFirstPartySetsClearSiteDataOnChangedSets{
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-FirstPartySets-and-StorageAccessAPI.inc b/cromite_flags/content/public/common/content_features_cc/Disable-FirstPartySets-and-StorageAccessAPI.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-FirstPartySets-and-StorageAccessAPI.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kFirstPartySets);
 --
 2.25.1
@@ -4,11 +4,12 @@ Subject: Disable GetInstalledRelatedApps API

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../components/installedapp/InstalledAppProviderImpl.java     | 1 +
- .../browser/installedapp/installed_app_provider_impl_win.cc   | 1 +
- content/public/common/content_features.cc                     | 4 ++--
- .../blink/renderer/platform/runtime_enabled_features.json5    | 2 +-
- 4 files changed, 5 insertions(+), 3 deletions(-)
+ .../components/installedapp/InstalledAppProviderImpl.java       | 1 +
+ content/browser/installedapp/installed_app_provider_impl_win.cc | 1 +
+ .../content_features_cc/Disable-GetInstalledRelatedApps-API.inc | 2 ++
+ .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc

 diff --git a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
 --- a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
@@ -32,24 +33,13 @@ diff --git a/content/browser/installedapp/installed_app_provider_impl_win.cc b/c
   ComPtr<ILauncherStatics4> launcher_statics;
   HRESULT hr = base::win::RoActivateInstance(
       base::win::ScopedHString::Create(RuntimeClass_Windows_System_Launcher)
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -451,12 +451,12 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
- BASE_FEATURE(kIdleDetection, "IdleDetection", base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // Kill switch for the GetInstalledRelatedApps API.
-BASE_FEATURE(kInstalledApp, "InstalledApp", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kInstalledApp, "InstalledApp", base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // Allow Windows specific implementation for the GetInstalledRelatedApps API.
- BASE_FEATURE(kInstalledAppProvider,
-              "InstalledAppProvider",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // Enable support for isolated web apps. This will guard features like serving
- // isolated web apps via the isolated-app:// scheme, and other advanced isolated
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc b/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
+@@ -0,0 +1,2 @@
+SET_CROMITE_FEATURE_DISABLED(kInstalledApp);
+SET_CROMITE_FEATURE_DISABLED(kInstalledAppProvider);
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -9,23 +9,27 @@ samesite=none first-party cookies are sent in third-party contexts.

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../net/profile_network_context_service.cc       |  8 ++++----
- .../core/common/cookie_settings_base.cc          |  2 +-
- .../content_settings/core/common/features.cc     |  4 ++--
- components/permissions/features.cc               |  4 ++--
- content/public/common/content_features.cc        |  4 ++--
- net/base/features.cc                             | 16 ++++++++--------
- net/cookies/canonical_cookie.cc                  | 12 +-----------
- net/cookies/cookie_deletion_info.cc              |  3 ++-
- net/cookies/parsed_cookie.h                      |  7 ++++++-
- .../sqlite/sqlite_persistent_cookie_store.cc     | 10 ++++++++++
- net/url_request/url_request_http_job.cc          |  2 +-
- services/network/restricted_cookie_manager.cc    |  3 +++
- .../modules/cookie_store/cookie_init.idl         |  2 +-
- .../modules/cookie_store/cookie_store.cc         | 12 ++++++++++++
- .../cookie_store/cookie_store_delete_options.idl |  2 +-
- ui/webui/webui_allowlist.cc                      |  1 +
- 16 files changed, 57 insertions(+), 35 deletions(-)
+ .../browser/net/profile_network_context_service.cc   |  8 ++++----
+ .../core/common/cookie_settings_base.cc              |  2 +-
+ .../Partitioning-all-cookies-by-top-frame-domain.inc |  1 +
+ .../Partitioning-all-cookies-by-top-frame-domain.inc |  1 +
+ .../Partitioning-all-cookies-by-top-frame-domain.inc |  1 +
+ .../Partitioning-all-cookies-by-top-frame-domain.inc |  5 +++++
+ net/cookies/canonical_cookie.cc                      | 12 +-----------
+ net/cookies/cookie_deletion_info.cc                  |  3 ++-
+ net/cookies/parsed_cookie.h                          |  7 ++++++-
+ net/extras/sqlite/sqlite_persistent_cookie_store.cc  | 10 ++++++++++
+ net/url_request/url_request_http_job.cc              |  2 +-
+ services/network/restricted_cookie_manager.cc        |  3 +++
+ .../renderer/modules/cookie_store/cookie_init.idl    |  2 +-
+ .../renderer/modules/cookie_store/cookie_store.cc    | 12 ++++++++++++
+ .../cookie_store/cookie_store_delete_options.idl     |  2 +-
+ ui/webui/webui_allowlist.cc                          |  1 +
+ 16 files changed, 51 insertions(+), 21 deletions(-)
+ create mode 100644 cromite_flags/components/content_settings/core/common/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+ create mode 100644 cromite_flags/components/permissions/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+ create mode 100644 cromite_flags/net/base/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc

 diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
 --- a/chrome/browser/net/profile_network_context_service.cc
@@ -61,95 +65,34 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c
                 : ThirdPartyBlockingScope::kUnpartitionedAndPartitioned;
   }
   return {block_third ? CONTENT_SETTING_BLOCK : setting, scope,
-diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc
--- a/components/content_settings/core/common/features.cc
-+++ b/components/content_settings/core/common/features.cc
-@@ -79,8 +79,8 @@ BASE_FEATURE(kImprovedSemanticsActivityIndicators,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kTrackingProtection3pcd,
-             "TrackingProtection3pcd",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "TrackingProtection3pcd",           // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT); // by default
- 
- }  // namespace features
- }  // namespace content_settings
-diff --git a/components/permissions/features.cc b/components/permissions/features.cc
--- a/components/permissions/features.cc
-+++ b/components/permissions/features.cc
-@@ -156,8 +156,8 @@ BASE_FEATURE(kMitigateUnpartitionedWebviewPermissions,
- // This includes enabling prompts, a new settings page and page info and
- // omnibox integration.
- BASE_FEATURE(kPermissionStorageAccessAPI,
-             "PermissionStorageAccessAPI",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "PermissionStorageAccessAPI",        // guard
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // this
- 
- // When enabled "window-placement" may be used as an alias for
- // "window-management". Additionally, reverse mappings (i.e. enum to string)
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -186,8 +186,8 @@ BASE_FEATURE(kCompositeBGColorAnimation,
- // server side testing without cookies.
- // (See https://developer.chrome.com/en/docs/privacy-sandbox/chrome-testing)
- BASE_FEATURE(kCookieDeprecationFacilitatedTesting,
-             "CookieDeprecationFacilitatedTesting",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "CookieDeprecationFacilitatedTesting",  // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);     // by default
- 
- // Set whether to enable cookie deprecation API for off-the-record profiles.
- const base::FeatureParam<bool>
-diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
-+++ b/net/base/features.cc
-@@ -260,8 +260,8 @@ BASE_FEATURE(kWaitForFirstPartySetsInit,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kPartitionedCookies,
-             "PartitionedCookies",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PartitionedCookies",                  // guard this
-+             base::FEATURE_ENABLED_BY_DEFAULT);     // guard this
- 
- BASE_FEATURE(kBlockTruncatedCookies,
-              "BlockTruncatedCookies",
-@@ -272,8 +272,8 @@ BASE_FEATURE(kStaticKeyPinningEnforcement,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kCookieDomainRejectNonASCII,
-             "CookieDomainRejectNonASCII",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "CookieDomainRejectNonASCII",          // guard this
-+             base::FEATURE_ENABLED_BY_DEFAULT);     // guard this
- 
- // Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.)
- // by the top level site to reduce fingerprinting.
-@@ -446,8 +446,8 @@ BASE_FEATURE(kEnableSchemeBoundCookies,
- 
- // Enable third-party cookie blocking from the command line.
- BASE_FEATURE(kForceThirdPartyCookieBlocking,
-             "ForceThirdPartyCookieBlockingEnabled",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "ForceThirdPartyCookieBlockingEnabled", // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);     // by default
- 
- BASE_FEATURE(kEnableEarlyHintsOnHttp11,
-              "EnableEarlyHintsOnHttp11",
-@@ -469,8 +469,8 @@ BASE_FEATURE(kDigestAuthEnableSecureAlgorithms,
- // are disabled by default. Partitioned storage will not be allowed if
- // third-party cookies are disabled due to a specific rule.
- BASE_FEATURE(kThirdPartyPartitionedStorageAllowedByDefault,
-             "ThirdPartyPartitionedStorageAllowedByDefault",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "ThirdPartyPartitionedStorageAllowedByDefault",  // must be
-+             base::FEATURE_DISABLED_BY_DEFAULT);              // disabled
- 
- BASE_FEATURE(kPriorityHeader,
-              "PriorityHeader",
+diff --git a/cromite_flags/components/content_settings/core/common/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc b/cromite_flags/components/content_settings/core/common/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/components/content_settings/core/common/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kTrackingProtection3pcd);
+diff --git a/cromite_flags/components/permissions/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc b/cromite_flags/components/permissions/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/components/permissions/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kPermissionStorageAccessAPI);
+diff --git a/cromite_flags/content/public/common/content_features_cc/Partitioning-all-cookies-by-top-frame-domain.inc b/cromite_flags/content/public/common/content_features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kCookieDeprecationFacilitatedTesting);
+diff --git a/cromite_flags/net/base/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc b/cromite_flags/net/base/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/net/base/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
+@@ -0,0 +1,5 @@
+SET_CROMITE_FEATURE_ENABLED(kPartitionedCookies);
+SET_CROMITE_FEATURE_ENABLED(kCookieDomainRejectNonASCII);
+
+SET_CROMITE_FEATURE_DISABLED(kForceThirdPartyCookieBlocking);
+SET_CROMITE_FEATURE_DISABLED(kThirdPartyPartitionedStorageAllowedByDefault);
 diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
 --- a/net/cookies/canonical_cookie.cc
 +++ b/net/cookies/canonical_cookie.cc
@@ -1,23 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Tue, 20 Dec 2022 15:09:46 +0000
-Subject: Temp Disable kAutomaticLazyFrameLoadingToEmbeds
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
- third_party/blink/common/features.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -180,7 +180,7 @@ const base::FeatureParam<int> kSkipFrameCountForLazyAds(
- // Vitals.
- BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds,
-              "AutomaticLazyFrameLoadingToEmbeds",    // must be enabled
-             base::FEATURE_ENABLED_BY_DEFAULT);      // in Bromite
-+             base::FEATURE_DISABLED_BY_DEFAULT);      // in Bromite
- 
- // The timeout value that forces loading iframes that are lazy loaded by
- // LazyEmbeds. After this timeout, the frame loading is triggered even when the
--
-2.25.1
@@ -15,14 +15,15 @@ you can remove the message by going to chrome://flags/#no-hw-aes-warning
 chrome/BUILD.gn                                        |  3 +++
 chrome/app/chrome_main_delegate.cc                     | 10 ++++++++++
 chrome/app/generated_resources.grd                     |  4 ++++
- chrome/browser/about_flags.cc                          |  4 ++++
- chrome/browser/flag_descriptions.cc                    |  4 ++++
- chrome/browser/flag_descriptions.h                     |  3 +++
 chrome/browser/ui/startup/bad_flags_prompt.cc          |  9 +++++++++
 .../browser/renderer_host/render_process_host_impl.cc  |  1 +
- content/public/common/content_features.cc              |  5 +++++
- content/public/common/content_features.h               |  1 +
- 12 files changed, 47 insertions(+)
+ .../Warning-message-for-unsupported-hardware-aes.inc   |  9 +++++++++
+ .../Warning-message-for-unsupported-hardware-aes.inc   |  4 ++++
+ .../Warning-message-for-unsupported-hardware-aes.inc   |  1 +
+ 10 files changed, 44 insertions(+)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Warning-message-for-unsupported-hardware-aes.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Warning-message-for-unsupported-hardware-aes.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_h/Warning-message-for-unsupported-hardware-aes.inc

 diff --git a/base/base_switches.cc b/base/base_switches.cc
 --- a/base/base_switches.cc
@@ -108,47 +109,6 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
       <!-- Bad Environment Variables Infobar-->
       <message name="IDS_BAD_ENVIRONMENT_VARIABLES_WARNING_MESSAGE" desc="Message shown when an unsupported environment variable is used [Keep it short so it fits in the infobar.]">
         You are using an unsupported environment variable: <ph name="BAD_VAR">$1<ex>SSLKEYLOGFILE</ex></ph>. Stability and security will suffer.
-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
-@@ -8414,6 +8414,10 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kViewportSegmentsDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kViewportSegments)},
- 
-+    {"no-hw-aes-warning", flag_descriptions::kNoAESHardwareMessageName,
-+     flag_descriptions::kNoAESHardwareMessageDescription, kOsDesktop | kOsAndroid,
-+     FEATURE_VALUE_TYPE(features::kNoAESHardwareMessage)},
-+
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-     {"device-force-scheduled-reboot",
-      flag_descriptions::kDeviceForceScheduledRebootName,
-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
-@@ -897,6 +897,10 @@ const char kViewportSegmentsDescription[] =
-     "Enable the viewport segment API, giving information about the logical "
-     "segments of the device (dual screen and foldable devices)";
- 
-+const char kNoAESHardwareMessageName[] = "Enable no aes warning message";
-+const char kNoAESHardwareMessageDescription[] =
-+    "Displays a warning message if the device does not have aes support in the hardware";
-+
- const char kDiscountConsentV2Name[] = "Discount Consent V2";
- const char kDiscountConsentV2Description[] = "Enables Discount Consent V2";
- 
-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
-@@ -644,6 +644,9 @@ extern const char kDeviceForceScheduledRebootDescription[];
- extern const char kDevicePostureName[];
- extern const char kDevicePostureDescription[];
- 
-+extern const char kNoAESHardwareMessageName[];
-+extern const char kNoAESHardwareMessageDescription[];
-+
- extern const char kEnableTLS13EarlyDataName[];
- extern const char kEnableTLS13EarlyDataDescription[];
- 
 diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc
 +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -179,31 +139,34 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
   };
   renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames);
 
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -600,6 +600,11 @@ BASE_FEATURE(kNoStatePrefetchHoldback,
-              "NoStatePrefetchHoldback",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+// Show a warning message to user if aes hardware is not found
-+BASE_FEATURE(kNoAESHardwareMessage,
-+             "NoAESHardwareMessage",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Warning-message-for-unsupported-hardware-aes.inc b/cromite_flags/chrome/browser/about_flags_cc/Warning-message-for-unsupported-hardware-aes.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Warning-message-for-unsupported-hardware-aes.inc
+@@ -0,0 +1,9 @@
 +
- // Controls the Origin-Agent-Cluster header. Tracking bug
- // https://crbug.com/1042415; flag removal bug (for when this is fully launched)
- // https://crbug.com/1148057.
-diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
--- a/content/public/common/content_features.h
-+++ b/content/public/common/content_features.h
-@@ -155,6 +155,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kNetworkServiceInProcess);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kNotificationContentImage);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kNotificationTriggers);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kNoStatePrefetchHoldback);
+#ifdef FLAG_SECTION
+
+    {"no-hw-aes-warning",
+     "Enable no aes warning message",
+     "Displays a warning message if the device does not have aes support in the hardware", kOsDesktop | kOsAndroid,
+     FEATURE_VALUE_TYPE(features::kNoAESHardwareMessage)},
+
+#endif
+diff --git a/cromite_flags/content/public/common/content_features_cc/Warning-message-for-unsupported-hardware-aes.inc b/cromite_flags/content/public/common/content_features_cc/Warning-message-for-unsupported-hardware-aes.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Warning-message-for-unsupported-hardware-aes.inc
+@@ -0,0 +1,4 @@
+// Show a warning message to user if aes hardware is not found
+CROMITE_FEATURE(kNoAESHardwareMessage,
+                "NoAESHardwareMessage",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/cromite_flags/content/public/common/content_features_h/Warning-message-for-unsupported-hardware-aes.inc b/cromite_flags/content/public/common/content_features_h/Warning-message-for-unsupported-hardware-aes.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_h/Warning-message-for-unsupported-hardware-aes.inc
+@@ -0,0 +1 @@
 +CONTENT_EXPORT BASE_DECLARE_FEATURE(kNoAESHardwareMessage);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kOriginIsolationHeader);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kOverscrollHistoryNavigation);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kOverscrollHistoryNavigationSetting);
 --
 2.25.1
@@ -20,19 +20,21 @@ See discussions at:

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- base/android/android_image_reader_compat.cc |  8 +++++++-
- base/android/android_image_reader_compat.h  |  4 ++++
- chrome/browser/flag-metadata.json           |  6 +++---
- gpu/config/gpu_driver_bug_list.json         | 16 ++++++++++++++++
- gpu/config/gpu_finch_features.cc            |  5 +++++
- gpu/config/gpu_finch_features.h             |  1 +
- gpu/config/gpu_util.cc                      |  8 ++++++++
- gpu/config/gpu_workaround_list.txt          |  1 +
- gpu/ipc/service/gpu_init.cc                 |  7 +++++++
- gpu/ipc/service/stream_texture_android.cc   | 11 ++++++++++-
- media/base/media_switches.cc                |  5 +++++
- media/base/media_switches.h                 |  1 +
- 12 files changed, 68 insertions(+), 5 deletions(-)
+ base/android/android_image_reader_compat.cc      |  8 +++++++-
+ base/android/android_image_reader_compat.h       |  4 ++++
+ chrome/browser/flag-metadata.json                |  6 +++---
+ .../AImageReader-CFI-crash-mitigations.inc       |  4 ++++
+ .../AImageReader-CFI-crash-mitigations.inc       |  1 +
+ gpu/config/gpu_driver_bug_list.json              | 16 ++++++++++++++++
+ gpu/config/gpu_finch_features.cc                 |  5 +++++
+ gpu/config/gpu_finch_features.h                  |  1 +
+ gpu/config/gpu_util.cc                           |  8 ++++++++
+ gpu/config/gpu_workaround_list.txt               |  1 +
+ gpu/ipc/service/gpu_init.cc                      |  7 +++++++
+ gpu/ipc/service/stream_texture_android.cc        | 11 ++++++++++-
+ 12 files changed, 67 insertions(+), 5 deletions(-)
+ create mode 100644 cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
+ create mode 100644 cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc

 diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc
 --- a/base/android/android_image_reader_compat.cc
@@ -97,6 +99,21 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
   },
   {
     "name": "enable-immersive-fullscreen-toolbar",
+diff --git a/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc b/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
+@@ -0,0 +1,4 @@
+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
+CROMITE_FEATURE(kAImageReaderVideoOutput,
+                "AImageReaderVideoOutput",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc b/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
+@@ -0,0 +1 @@
+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput);
 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
@@ -126,29 +143,29 @@ 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
-@@ -70,6 +70,11 @@ BASE_FEATURE(kUseGles2ForOopR,
- #endif
+@@ -71,6 +71,11 @@ BASE_FEATURE(kUseGles2ForOopR,
 );
 
-+
-+// Use android AImageReader when playing videos with MediaPlayer.
-+const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
-+                                  base::FEATURE_ENABLED_BY_DEFAULT};
-+
 #if BUILDFLAG(IS_ANDROID)
+// Use android AImageReader when playing videos with MediaPlayer.
+CROMITE_FEATURE(kAImageReaderMediaPlayer,
+                "AImageReaderMediaPlayer",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+
 // Use android SurfaceControl API for managing display compositor's buffer queue
 // and using overlays on Android. Also used by webview to disable surface
+ // SurfaceControl.
 diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
 --- a/gpu/config/gpu_finch_features.h
 +++ b/gpu/config/gpu_finch_features.h
-@@ -22,6 +22,7 @@ namespace features {
- GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
- 
+@@ -24,6 +24,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
 // All features in alphabetical order. The features should be documented
-+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;
 // alongside the definition of their values in the .cc file.
 #if BUILDFLAG(IS_ANDROID)
+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);
 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
+ GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);
+ GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReader);
 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
@@ -230,31 +247,5 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
              ? TextureOwner::Mode::kAImageReaderInsecure
              : TextureOwner::Mode::kSurfaceTextureInsecure;
 }
-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
-@@ -1022,6 +1022,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,
- // Allows automatically disabling hardware secure Content Decryption Module
- // (CDM) after failures or crashes to fallback to software secure CDMs. If this
- // feature is disabled, the fallback will never happen and users could be stuck
-+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
-+BASE_FEATURE(kAImageReaderVideoOutput,
-+             "AImageReaderVideoOutput",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
- // in playback failures.
- BASE_FEATURE(kHardwareSecureDecryptionFallback,
-              "HardwareSecureDecryptionFallback",
-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
-@@ -348,6 +348,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoToolboxVideoDecoder);
- #endif  // BUILDFLAG(IS_APPLE)
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebRTCColorAccuracy);
-+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kVp9kSVCHWDecoding);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi);
- MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebrtcMediaCapabilitiesParameters);
 --
 2.25.1
@@ -48,15 +48,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/tabmodel/TabPersistentStore.java  |   9 +
 .../browser/toolbar/ToolbarManager.java       |   4 +-
 .../webapps/WebappIntentDataProvider.java     |  14 ++
- chrome/browser/about_flags.cc                 |   4 +
 .../browser/android/historical_tab_saver.cc   |  24 ++-
 .../chrome_autocomplete_provider_client.cc    |   9 +
 .../chrome_autocomplete_provider_client.h     |   1 +
 .../remote_suggestions_service_factory.cc     |   5 +
 .../host_content_settings_map_factory.cc      |  22 ++-
- chrome/browser/flag_descriptions.cc           |   6 +
- chrome/browser/flag_descriptions.h            |   3 +
- .../flags/android/chrome_feature_list.cc      |   4 +-
 chrome/browser/history/history_tab_helper.cc  |  20 +++
 chrome/browser/history/history_tab_helper.h   |  10 +-
 .../android/offline_page_bridge.cc            |  11 +-
@@ -80,17 +76,23 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/content_settings_pref_provider.h  |   2 +
 .../core/browser/host_content_settings_map.cc |   4 +-
 .../core/browser/host_content_settings_map.h  |   3 +
- .../core/offline_page_feature.cc              |   3 +
- .../offline_pages/core/offline_page_feature.h |   1 +
 .../browser/autocomplete_provider_client.cc   |   4 +
 .../browser/autocomplete_provider_client.h    |   1 +
 .../omnibox/browser/base_search_provider.cc   |   2 +-
 components/omnibox/browser/search_provider.cc |   4 +-
- 67 files changed, 763 insertions(+), 94 deletions(-)
+ .../add-an-always-incognito-mode.inc          |  13 ++
+ .../add-an-always-incognito-mode.inc          |   1 +
+ .../add-an-always-incognito-mode.inc          |   3 +
+ .../add-an-always-incognito-mode.inc          |   1 +
+ 65 files changed, 762 insertions(+), 92 deletions(-)
 create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
 create mode 100644 chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/INeedSnackbarManager.java
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-an-always-incognito-mode.inc
+ create mode 100644 cromite_flags/components/offline_pages/core/offline_page_feature_cc/add-an-always-incognito-mode.inc
+ create mode 100644 cromite_flags/components/offline_pages/core/offline_page_feature_h/add-an-always-incognito-mode.inc

 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
@@ -1185,20 +1187,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
     @Override
     public @ScreenOrientationLockType.EnumType int getDefaultOrientation() {
         return mWebappExtras.orientation;
-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
-@@ -5412,6 +5412,10 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kOfflinePagesLivePageSharingName,
-      flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
-+    {"offline-pages-auto-save",
-+     flag_descriptions::kOfflinePagesAutoSaveFeatureName,
-+     flag_descriptions::kOfflinePagesAutoSaveFeatureDescription, kOsAndroid,
-+     FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesAutoSaveFeature)},
-     {"query-tiles", flag_descriptions::kQueryTilesName,
-      flag_descriptions::kQueryTilesDescription, kOsAndroid,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(query_tiles::features::kQueryTiles,
 diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/android/historical_tab_saver.cc
 --- a/chrome/browser/android/historical_tab_saver.cc
 +++ b/chrome/browser/android/historical_tab_saver.cc
@@ -1366,49 +1354,6 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   // These must be registered before before the HostSettings are passed over to
   // the IOThread.  Simplest to do this on construction.
-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
-@@ -4209,6 +4209,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
-     "Enables to share current loaded page as offline page by saving as MHTML "
-     "first.";
- 
-+const char kOfflinePagesAutoSaveFeatureName[] =
-+    "Enables autosave of offline page";
-+const char kOfflinePagesAutoSaveFeatureDescription[] =
-+    "Enables autosave of offline page, as automatic switching in case "
-+    "the device goes offline.";
-+
- const char kPageInfoHistoryName[] = "Page info history";
- const char kPageInfoHistoryDescription[] =
-     "Enable a history sub page to the page info menu, and a button to forget "
-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
-@@ -2484,6 +2484,9 @@ extern const char kOmahaMinSdkVersionAndroidDescription[];
- extern const char kOmahaMinSdkVersionAndroidMinSdk1Description[];
- extern const char kOmahaMinSdkVersionAndroidMinSdk1000Description[];
- 
-+extern const char kOfflinePagesAutoSaveFeatureName[];
-+extern const char kOfflinePagesAutoSaveFeatureDescription[];
-+
- extern const char kPageInfoHistoryName[];
- extern const char kPageInfoHistoryDescription[];
- 
-diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
-+++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -588,8 +588,8 @@ BASE_FEATURE(kCCTFeatureUsage,
- BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
-             "CCTIncognitoAvailableToThirdParty",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "CCTIncognitoAvailableToThirdParty",           // must be enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);             // in Bromite
- 
- BASE_FEATURE(kCCTIntentFeatureOverrides,
-              "CCTIntentFeatureOverrides",
 diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
 --- a/chrome/browser/history/history_tab_helper.cc
 +++ b/chrome/browser/history/history_tab_helper.cc
@@ -2097,30 +2042,6 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
   // Whether ContentSettings in the PrefProvider will store a last_modified
   // timestamp.
   bool store_last_modified_;
-diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
--- a/components/offline_pages/core/offline_page_feature.cc
-+++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -44,6 +44,9 @@ BASE_FEATURE(kOfflinePagesNetworkStateLikelyUnknown,
-              "OfflinePagesNetworkStateLikelyUnknown",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+const base::Feature kOfflinePagesAutoSaveFeature{
-+    "OfflinePagesAutoSaveEnabled", base::FEATURE_DISABLED_BY_DEFAULT};
-+
- const char kPrefetchingOfflinePagesExperimentsOption[] = "exp";
- 
- bool IsOfflinePagesCTEnabled() {
-diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
--- a/components/offline_pages/core/offline_page_feature.h
-+++ b/components/offline_pages/core/offline_page_feature.h
-@@ -19,6 +19,7 @@ BASE_DECLARE_FEATURE(kOfflinePagesInDownloadHomeOpenInCctFeature);
- BASE_DECLARE_FEATURE(kOfflinePagesDescriptiveFailStatusFeature);
- BASE_DECLARE_FEATURE(kOnTheFlyMhtmlHashComputationFeature);
- BASE_DECLARE_FEATURE(kOfflinePagesNetworkStateLikelyUnknown);
-+extern const base::Feature kOfflinePagesAutoSaveFeature;
- 
- // The parameter name used to find the experiment tag for prefetching offline
- // pages.
 diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/components/omnibox/browser/autocomplete_provider_client.cc
 --- a/components/omnibox/browser/autocomplete_provider_client.cc
 +++ b/components/omnibox/browser/autocomplete_provider_client.cc
@@ -2169,5 +2090,43 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
          ((default_url && !default_url->suggestions_url().empty() &&
            !*query_is_private) ||
           (keyword_url && !keyword_url->suggestions_url().empty()));
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc b/cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc
+@@ -0,0 +1,13 @@
+#ifdef FLAG_SECTION
+
+#if BUILDFLAG(IS_ANDROID)
+
+    {"offline-pages-auto-save",
+     "Enables autosave of offline page",
+     "Enables autosave of offline page, as automatic switching in case "
+     "the device goes offline.", kOsAndroid,
+     FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesAutoSaveFeature)},
+
+#endif
+
+#endif
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-an-always-incognito-mode.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-an-always-incognito-mode.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-an-always-incognito-mode.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_ENABLED(kCCTIncognitoAvailableToThirdParty);
+diff --git a/cromite_flags/components/offline_pages/core/offline_page_feature_cc/add-an-always-incognito-mode.inc b/cromite_flags/components/offline_pages/core/offline_page_feature_cc/add-an-always-incognito-mode.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/components/offline_pages/core/offline_page_feature_cc/add-an-always-incognito-mode.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kOfflinePagesAutoSaveFeature,
+                "OfflinePagesAutoSaveEnabled",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/components/offline_pages/core/offline_page_feature_h/add-an-always-incognito-mode.inc b/cromite_flags/components/offline_pages/core/offline_page_feature_h/add-an-always-incognito-mode.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/components/offline_pages/core/offline_page_feature_h/add-an-always-incognito-mode.inc
+@@ -0,0 +1 @@
+BASE_DECLARE_FEATURE(kOfflinePagesAutoSaveFeature);
 --
 2.25.1
@@ -26,16 +26,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../bookmarks/BookmarkToolbarViewBinder.java  |   6 +
 .../native_page/NativePageFactory.java        |  11 +-
 chrome/browser/BUILD.gn                       |  11 +-
- chrome/browser/about_flags.cc                 |   8 +
 .../bookmarks/android/bookmark_bridge.cc      | 283 ++++++++++++++++++
 .../bookmarks/android/bookmark_bridge.h       |  30 +-
 .../browser/bookmarks/bookmark_html_writer.cc |  11 +
 .../dialogs/DownloadLocationCustomView.java   |   8 +-
 .../DownloadLocationDialogCoordinator.java    |   8 +-
- chrome/browser/flag_descriptions.cc           |   5 +
- chrome/browser/flag_descriptions.h            |   3 +
- .../flags/android/chrome_feature_list.cc      |   6 +
- .../flags/android/chrome_feature_list.h       |   1 +
+ .../flags/android/chrome_feature_list.cc      |   1 +
 .../browser/flags/ChromeFeatureList.java      |   1 +
 chrome/browser/importer/profile_writer.cc     |  12 +
 chrome/browser/importer/profile_writer.h      |   6 +
@@ -46,6 +42,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../utility/importer/bookmark_html_reader.cc  |  28 +-
 .../utility/importer/bookmark_html_reader.h   |   8 +
 .../headless_select_file_dialog.cc            |   4 +
+ .../add-bookmark-import-export-actions.inc    |  12 +
+ .../add-bookmark-import-export-actions.inc    |   4 +
+ .../add-bookmark-import-export-actions.inc    |   1 +
 .../chromium/ui/base/SelectFileDialog.java    |  18 +-
 .../java/strings/android_ui_strings.grd       |   3 +
 ui/shell_dialogs/select_file_dialog.h         |   2 +
@@ -54,7 +53,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
 ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
 ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 44 files changed, 922 insertions(+), 29 deletions(-)
+ 43 files changed, 917 insertions(+), 29 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc

 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
@@ -861,24 +863,6 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
       "bookmarks/url_and_id.h",
       "cart/cart_db.cc",
       "cart/cart_db.h",
-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
-@@ -9828,6 +9828,14 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kForceOffTextAutosizing)},
- #endif
- 
-+#if BUILDFLAG(IS_ANDROID)
-+    {"export-bookmarks-use-saf",
-+     flag_descriptions::kBookmarksExportUseSafName,
-+     flag_descriptions::kBookmarksExportUseSafDescription, kOsAndroid,
-+     FEATURE_VALUE_TYPE(
-+         chrome::android::kBookmarksExportUseSaf)},
-+#endif
-+
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-     {"video-conference", flag_descriptions::kVideoConferenceName,
-      flag_descriptions::kVideoConferenceDescription, kOsCrOS,
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -1379,34 +1363,6 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
         // Already showing the dialog.
         if (mDialogModel != null) return;
 
-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
-@@ -7758,6 +7758,11 @@ const char kEnableBoundSessionCredentialsDescription[] =
-     "prevent the usage of bound credentials outside of the user device.";
- #endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
- 
-+const char kBookmarksExportUseSafName[] = "Use saf for bookmarks export";
-+const char kBookmarksExportUseSafDescription[] =
-+    "When enabled user can choose where save the exported bookmarks "
-+    "file.";
-+
- // ============================================================================
- // Don't just add flags to the end, put them in the right section in
- // alphabetical order just like the header file.
-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
-@@ -4493,6 +4493,9 @@ extern const char kEnableBoundSessionCredentialsName[];
- extern const char kEnableBoundSessionCredentialsDescription[];
- #endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
- 
-+extern const char kBookmarksExportUseSafName[];
-+extern const char kBookmarksExportUseSafDescription[];
-+
- // ============================================================================
- // Don't just add flags to the end, put them in the right section in
- // alphabetical order. See top instructions for more.
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -1418,28 +1374,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
     &kCriticalPersistedTabData,
     &kCreateNewTabInitializeRenderer,
     &kCCTBackgroundTab,
-@@ -1195,5 +1196,10 @@ BASE_FEATURE(kWebApkInstallService,
-              "WebApkInstallService",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+// disabled by default because of an issue on Android 6.0
-+BASE_FEATURE(kBookmarksExportUseSaf,
-+             "BookmarksExportUseSaf",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- }  // namespace android
- }  // namespace chrome
-diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
-+++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -189,6 +189,7 @@ BASE_DECLARE_FEATURE(kTabStripRedesign);
- BASE_DECLARE_FEATURE(kTabletToolbarReordering);
- BASE_DECLARE_FEATURE(kTabStripStartupRefactoring);
- BASE_DECLARE_FEATURE(kTabToGTSAnimation);
-+BASE_DECLARE_FEATURE(kBookmarksExportUseSaf);
- BASE_DECLARE_FEATURE(kTestDefaultDisabled);
- BASE_DECLARE_FEATURE(kTestDefaultEnabled);
- BASE_DECLARE_FEATURE(kThumbnailPlaceholder);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -1709,6 +1643,38 @@ diff --git a/components/headless/select_file_dialog/headless_select_file_dialog.
   SelectFileDialogCallback callback_;
 };
 
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc b/cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
+@@ -0,0 +1,12 @@
+#ifdef FLAG_SECTION
+
+#if BUILDFLAG(IS_ANDROID)
+    {"export-bookmarks-use-saf",
+     "Use saf for bookmarks export",
+     "When enabled user can choose where save the exported bookmarks "
+     "file.", kOsAndroid,
+     FEATURE_VALUE_TYPE(
+         chrome::android::kBookmarksExportUseSaf)},
+#endif
+
+#endif
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
+@@ -0,0 +1,4 @@
+// disabled by default because of an issue on Android 6.0
+CROMITE_FEATURE(kBookmarksExportUseSaf,
+                "BookmarksExportUseSaf",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
+@@ -0,0 +1 @@
+BASE_DECLARE_FEATURE(kBookmarksExportUseSaf);
 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
@@ -15,11 +15,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/LaunchIntentDispatcher.java       | 21 ++++++++++++++++
 .../IncognitoCustomTabIntentDataProvider.java |  6 +++++
 .../privacy/settings/PrivacySettings.java     | 24 +++++++++++++++++++
- .../flags/android/chrome_feature_list.cc      |  6 ++---
 .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++++-
 .../strings/android_chrome_strings.grd        | 14 +++++++++++
- .../core/common/language_experiments.cc       |  4 ++--
- 8 files changed, 85 insertions(+), 6 deletions(-)
+ .../core/common/language_experiments.cc       |  1 +
+ .../add-custom-tab-intents-privacy-option.inc |  2 ++
+ 8 files changed, 83 insertions(+), 1 deletion(-)
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc

 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -171,29 +172,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
         if (doNotTrackPref != null) {
             doNotTrackPref.setSummary(
-diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
-+++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -592,8 +592,8 @@ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
-              base::FEATURE_ENABLED_BY_DEFAULT);             // in Bromite
- 
- BASE_FEATURE(kCCTIntentFeatureOverrides,
-             "CCTIntentFeatureOverrides",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "CCTIntentFeatureOverrides",                   // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);            // in Bromite
- 
- BASE_FEATURE(kCCTMinimized, "CCTMinimized", base::FEATURE_DISABLED_BY_DEFAULT);
- 
-@@ -603,7 +603,7 @@ BASE_FEATURE(kCCTPageInsightsHub,
- 
- BASE_FEATURE(kCCTPostMessageAPI,
-              "CCTPostMessageAPI",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kCCTPrefetchDelayShowOnStart,
-              "CCTPrefetchDelayShowOnStart",
 diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
@@ -237,16 +215,18 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc
 --- a/components/language/core/common/language_experiments.cc
 +++ b/components/language/core/common/language_experiments.cc
-@@ -18,8 +18,8 @@ BASE_FEATURE(kContentLanguagesInLanguagePicker,
-              "ContentLanguagesInLanguagePicker",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- BASE_FEATURE(kCctAutoTranslate,
-             "CCTAutoTranslate",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "CCTAutoTranslate",                  // Always disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
- 
+@@ -24,4 +24,5 @@ BASE_FEATURE(kCctAutoTranslate,
 // Params:
 const char kContentLanguagesDisableObserversParam[] = "disable_observers";
+ 
+SET_CROMITE_FEATURE_DISABLED(kCctAutoTranslate);
+ }  // namespace language
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc
+@@ -0,0 +1,2 @@
+SET_CROMITE_FEATURE_DISABLED(kCCTIntentFeatureOverrides);
+SET_CROMITE_FEATURE_DISABLED(kCCTPostMessageAPI);
 --
 2.25.1
@@ -8,68 +8,15 @@ with limited CPU/memory resources and it is disabled by default.

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                   |  8 ++++++++
- chrome/browser/flag_descriptions.cc             |  4 ++++
- chrome/browser/flag_descriptions.h              |  3 +++
 .../common/network_features.cc                  |  3 +++
 .../common/network_features.h                   |  4 ++++
 .../common/network_switch_list.h                |  4 ++++
 .../spoof_checks/top_domains/BUILD.gn           |  1 +
+ ...o-configure-maximum-connections-per-host.inc | 17 +++++++++++++++++
 net/socket/client_socket_pool_manager.cc        | 17 +++++++++++++++++
- 8 files changed, 44 insertions(+)
+ 6 files changed, 46 insertions(+)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc

-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
-@@ -1287,6 +1287,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = {
-      switches::kForceDisplayColorProfile, "hdr10"},
- };
- 
-+const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
-+    {features::kMaxConnectionsPerHostChoiceDefault, "", ""},
-+    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
-+};
-+
- const FeatureEntry::Choice kMemlogModeChoices[] = {
-     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
-     {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode,
-@@ -5494,6 +5499,9 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(chrome::android::kShareSheetCustomActionsPolish)},
- 
- #endif  // BUILDFLAG(IS_ANDROID)
-+    {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName,
-+     flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll,
-+     MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
-     {"disallow-doc-written-script-loads",
-      flag_descriptions::kDisallowDocWrittenScriptsUiName,
-      flag_descriptions::kDisallowDocWrittenScriptsUiDescription, kOsAll,
-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
-@@ -2231,6 +2231,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
-     "websites abusing the API will still eventually have their setTimeouts "
-     "clamped.";
- 
-+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
-+const char kMaxConnectionsPerHostDescription[] =
-+     "Customize maximum allowed connections per host.";
-+
- const char kMediaRouterCastAllowAllIPsName[] =
-     "Connect to Cast devices on all IP addresses";
- const char kMediaRouterCastAllowAllIPsDescription[] =
-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
-@@ -1264,6 +1264,9 @@ extern const char kUndoAutofillDescription[];
- extern const char kUnthrottledNestedTimeoutName[];
- extern const char kUnthrottledNestedTimeoutDescription[];
- 
-+extern const char kMaxConnectionsPerHostName[];
-+extern const char kMaxConnectionsPerHostDescription[];
-+
- extern const char kMediaRouterCastAllowAllIPsName[];
- extern const char kMediaRouterCastAllowAllIPsDescription[];
- 
 diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
 --- a/components/network_session_configurator/common/network_features.cc
 +++ b/components/network_session_configurator/common/network_features.cc
@@ -120,6 +67,28 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/compon
   ]
   if (is_ios) {
     frameworks = [ "UIKit.framework" ]
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc b/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc
+@@ -0,0 +1,17 @@
+#ifdef FEATURE_PARAM_SECTION
+
+const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
+    {features::kMaxConnectionsPerHostChoiceDefault, "", ""},
+    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
+};
+
+#endif
+
+#ifdef FLAG_SECTION
+
+    {"max-connections-per-host",
+     "Maximum connections per host",
+     "Customize maximum allowed connections per host.", kOsAll,
+     MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
+
+#endif
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
@@ -6,71 +6,35 @@ Disable it by default on Android as it is everywhere else

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc       | 4 ++++
- chrome/browser/flag_descriptions.cc | 5 +++++
- chrome/browser/flag_descriptions.h  | 3 +++
- media/base/media_switches.cc        | 8 ++------
- 4 files changed, 14 insertions(+), 6 deletions(-)
+ ...lag-to-control-video-playback-resume-feature.inc | 13 +++++++++++++
+ ...lag-to-control-video-playback-resume-feature.inc |  1 +
+ 2 files changed, 14 insertions(+)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-control-video-playback-resume-feature.inc
+ create mode 100644 cromite_flags/media/base/media_switches_cc/add-flag-to-control-video-playback-resume-feature.inc

-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
-@@ -4209,6 +4209,10 @@ const FeatureEntry kFeatureEntries[] = {
-          chrome::android::kContextualSearchSuppressShortView,
-          kContextualSearchSuppressShortViewVariations,
-          "ContextualSearchSuppressShortView")},
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-control-video-playback-resume-feature.inc b/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-control-video-playback-resume-feature.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-control-video-playback-resume-feature.inc
+@@ -0,0 +1,13 @@
+#ifdef FLAG_SECTION
+
+#if BUILDFLAG(IS_ANDROID)
+
 +    {"resume-background-video",
-+     flag_descriptions::kResumeBackgroundVideoName,
-+     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
+     "Resume background video.",
+     "Resume background video playback when tab re-gains focus; additionally, "
+     "it will pause video playback every single time you switch tabs.", kOsAll,
 +     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
-     {"related-searches", flag_descriptions::kRelatedSearchesName,
-      flag_descriptions::kRelatedSearchesDescription, kOsAndroid,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kRelatedSearches,
-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
-@@ -1477,6 +1477,11 @@ const char kEnableManagedConfigurationWebApiDescription[] =
-     "Allows website to access a managed configuration provided by the device "
-     "administrator for the origin.";
- 
-+const char kResumeBackgroundVideoName[] = "Resume background video.";
-+const char kResumeBackgroundVideoDescription[] =
-+    "Resume background video playback when tab re-gains focus; additionally, "
-+    "it will pause video playback every single time you switch tabs.";
 +
- const char kEnablePixelCanvasRecordingName[] = "Enable pixel canvas recording";
- const char kEnablePixelCanvasRecordingDescription[] =
-     "Pixel canvas recording allows the compositor to raster contents aligned "
-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
-@@ -814,6 +814,9 @@ extern const char kEnablePenetratingImageSelectionDescription[];
- extern const char kEnablePerfettoSystemTracingName[];
- extern const char kEnablePerfettoSystemTracingDescription[];
- 
-+extern const char kResumeBackgroundVideoName[];
-+extern const char kResumeBackgroundVideoDescription[];
+#endif // BUILDFLAG(IS_ANDROID)
 +
- extern const char kEnablePeripheralCustomizationName[];
- extern const char kEnablePeripheralCustomizationDescription[];
- 
-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
-@@ -360,12 +360,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad,
- // Let videos be resumed via remote controls (for example, the notification)
- // when in background.
- BASE_FEATURE(kResumeBackgroundVideo,
-             "resume-background-video",
-#if BUILDFLAG(IS_ANDROID)
-             base::FEATURE_ENABLED_BY_DEFAULT
-#else
-             base::FEATURE_DISABLED_BY_DEFAULT
-#endif
-+             "resume-background-video",           // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT    // in Bromite
- );
- 
- #if BUILDFLAG(IS_MAC)
+#endif // ifdef FLAG_SECTION
+diff --git a/cromite_flags/media/base/media_switches_cc/add-flag-to-control-video-playback-resume-feature.inc b/cromite_flags/media/base/media_switches_cc/add-flag-to-control-video-playback-resume-feature.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/media/base/media_switches_cc/add-flag-to-control-video-playback-resume-feature.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kResumeBackgroundVideo);
 --
 2.25.1
@@ -4,58 +4,44 @@ Subject: Add flag to disable IPv6 probes

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc           |  4 ++++
- chrome/browser/flag_descriptions.cc     |  4 ++++
- chrome/browser/flag_descriptions.h      |  3 +++
- net/BUILD.gn                            |  1 +
- net/base/features.cc                    |  4 ++++
- net/base/features.h                     |  3 +++
- net/dns/host_resolver_manager.cc        | 11 +++++++++++
- services/network/public/cpp/features.cc |  5 +++++
- services/network/public/cpp/features.h  |  1 +
- 9 files changed, 36 insertions(+)
+ .../add-flag-to-disable-IPv6-probes.inc               |  8 ++++++++
+ .../features_cc/add-flag-to-disable-IPv6-probes.inc   |  3 +++
+ .../features_h/add-flag-to-disable-IPv6-probes.inc    |  2 ++
+ net/BUILD.gn                                          |  1 +
+ net/dns/host_resolver_manager.cc                      | 11 +++++++++++
+ 5 files changed, 25 insertions(+)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-disable-IPv6-probes.inc
+ create mode 100644 cromite_flags/net/base/features_cc/add-flag-to-disable-IPv6-probes.inc
+ create mode 100644 cromite_flags/net/base/features_h/add-flag-to-disable-IPv6-probes.inc

-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
-@@ -6864,6 +6864,10 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
-      flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-disable-IPv6-probes.inc b/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-disable-IPv6-probes.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/add-flag-to-disable-IPv6-probes.inc
+@@ -0,0 +1,8 @@
+#ifdef FLAG_SECTION
+
 +    {"ipv6-probing",
-+     flag_descriptions::kIPv6ProbingName,
-+     flag_descriptions::kIPv6ProbingDescription, kOsAll,
+     "Enable IPv6 probing.",
+     "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.", kOsAll,
 +     FEATURE_VALUE_TYPE(net::features::kIPv6Probing)},
- #endif  // BUILDFLAG(IS_ANDROID)
- 
-     {"shopping-collection",
-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
-@@ -3951,6 +3951,10 @@ const char kAccountReauthenticationRecentTimeWindow0mins[] = "0 mins";
- const char kAccountReauthenticationRecentTimeWindow1mins[] = "1 mins";
- const char kAccountReauthenticationRecentTimeWindow5mins[] = "5 mins";
- 
-+const char kIPv6ProbingName[] = "Enable IPv6 probing.";
-+const char kIPv6ProbingDescription[] =
-+    "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.";
 +
- const char kChimeAlwaysShowNotificationDescription[] =
-     "A debug flag to always show Chime notification after receiving a payload.";
- const char kChimeAlwaysShowNotificationName[] =
-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
-@@ -892,6 +892,9 @@ extern const char kEnableWasmStringrefName[];
- extern const char kEnableWasmStringrefDescription[];
- 
- extern const char kEnableWasmTieringName[];
-+extern const char kIPv6ProbingName[];
-+extern const char kIPv6ProbingDescription[];
-+
- extern const char kEnableWasmTieringDescription[];
- 
- extern const char kEvDetailsInPageInfoName[];
+#endif // ifdef FLAG_SECTION
+diff --git a/cromite_flags/net/base/features_cc/add-flag-to-disable-IPv6-probes.inc b/cromite_flags/net/base/features_cc/add-flag-to-disable-IPv6-probes.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/net/base/features_cc/add-flag-to-disable-IPv6-probes.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kIPv6Probing,
+                "IPv6Probing",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/cromite_flags/net/base/features_h/add-flag-to-disable-IPv6-probes.inc b/cromite_flags/net/base/features_h/add-flag-to-disable-IPv6-probes.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/net/base/features_h/add-flag-to-disable-IPv6-probes.inc
+@@ -0,0 +1,2 @@
+// Enable IPv6 ping probes to RIPE DNS.
+NET_EXPORT BASE_DECLARE_FEATURE(kIPv6Probing);
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
@@ -67,33 +53,6 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
   ]
 
   public_deps = [
-diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
-+++ b/net/base/features.cc
-@@ -41,6 +41,10 @@ BASE_FEATURE(kUseDnsHttpsSvcb,
- const base::FeatureParam<bool> kUseDnsHttpsSvcbEnforceSecureResponse{
-     &kUseDnsHttpsSvcb, "UseDnsHttpsSvcbEnforceSecureResponse", false};
- 
-+BASE_FEATURE(kIPv6Probing,
-+             "IPv6Probing",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
- const base::FeatureParam<base::TimeDelta> kUseDnsHttpsSvcbInsecureExtraTimeMax{
-     &kUseDnsHttpsSvcb, "UseDnsHttpsSvcbInsecureExtraTimeMax",
-     base::Milliseconds(50)};
-diff --git a/net/base/features.h b/net/base/features.h
--- a/net/base/features.h
-+++ b/net/base/features.h
-@@ -52,6 +52,9 @@ NET_EXPORT BASE_DECLARE_FEATURE(kUseDnsHttpsSvcb);
- NET_EXPORT extern const base::FeatureParam<bool>
-     kUseDnsHttpsSvcbEnforceSecureResponse;
- 
-+// Enable IPv6 ping probes to RIPE DNS.
-+NET_EXPORT BASE_DECLARE_FEATURE(kIPv6Probing);
-+
- // If we are still waiting for an HTTPS transaction after all the
- // other transactions in an insecure DnsTask have completed, we will compute a
- // timeout for the remaining transaction. The timeout will be
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
@@ -129,31 +88,5 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
   if (probing_ipv6_) {
     ipv6_request_callbacks_.push_back(std::move(callback));
     return ERR_IO_PENDING;
-diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
--- a/services/network/public/cpp/features.cc
-+++ b/services/network/public/cpp/features.cc
-@@ -32,6 +32,11 @@ BASE_FEATURE(kThrottleDelayable,
-              "ThrottleDelayable",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
-+// Enable IPv6 ping probes to RIPE DNS.
-+BASE_FEATURE(kIPv6Probing,
-+             "IPv6Probing",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
- // When kPriorityRequestsDelayableOnSlowConnections is enabled, HTTP
- // requests fetched from a SPDY/QUIC/H2 proxies can be delayed by the
- // ResourceScheduler just as HTTP/1.1 resources are. However, requests from such
-diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
--- a/services/network/public/cpp/features.h
-+++ b/services/network/public/cpp/features.h
-@@ -16,6 +16,7 @@ namespace features {
- COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kNetworkErrorLogging);
- COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kReporting);
- COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kThrottleDelayable);
-+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kIPv6Probing);
- COMPONENT_EXPORT(NETWORK_CPP)
- BASE_DECLARE_FEATURE(kDelayRequestsOnMultiplexedConnections);
- COMPONENT_EXPORT(NETWORK_CPP)
 --
 2.25.1
@@ -4,57 +4,19 @@ Subject: Add flag to disable vibration

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                                | 4 ++++
- chrome/browser/flag_descriptions.cc                          | 3 +++
- chrome/browser/flag_descriptions.h                           | 2 ++
- content/child/runtime_features.cc                            | 1 +
- content/public/common/content_features.cc                    | 5 +++++
- content/public/common/content_features.h                     | 2 ++
- third_party/blink/public/platform/web_runtime_features.h     | 1 +
- .../blink/renderer/modules/vibration/vibration_controller.cc | 3 +++
- .../blink/renderer/platform/exported/web_runtime_features.cc | 4 ++++
- .../blink/renderer/platform/runtime_enabled_features.json5   | 4 ++++
- 10 files changed, 29 insertions(+)
+ content/child/runtime_features.cc                         | 1 +
+ .../about_flags_cc/Add-flag-to-disable-vibration.inc      | 8 ++++++++
+ .../content_features_cc/Add-flag-to-disable-vibration.inc | 4 ++++
+ .../content_features_h/Add-flag-to-disable-vibration.inc  | 1 +
+ third_party/blink/public/platform/web_runtime_features.h  | 1 +
+ .../renderer/modules/vibration/vibration_controller.cc    | 3 +++
+ .../renderer/platform/exported/web_runtime_features.cc    | 4 ++++
+ .../renderer/platform/runtime_enabled_features.json5      | 4 ++++
+ 8 files changed, 26 insertions(+)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-vibration.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Add-flag-to-disable-vibration.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_h/Add-flag-to-disable-vibration.inc

-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
-@@ -8432,6 +8432,10 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
- #endif
- 
-+    {"enable-vibration", flag_descriptions::kEnableVibrationName,
-+     flag_descriptions::kEnableVibrationDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(features::kVibration)},
-+
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-     {"exo-consumed-by-ime-by-flag",
-      flag_descriptions::kExoConsumedByImeByFlagName,
-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
-@@ -7338,6 +7338,9 @@ const char kLacrosMergeIcuDataFileDescription[] =
-     "Enables sharing common areas of icudtl.dat between Ash and Lacros.";
- #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
- 
-+const char kEnableVibrationName[] = "Vibration";
-+const char kEnableVibrationDescription[] = "Enable vibration API; an user gesture will still be needed.";
-+
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
- const char kGetAllScreensMediaDescription[] =
-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
-@@ -4466,6 +4466,8 @@ extern const char kWebUITabStripContextMenuAfterTapName[];
- extern const char kWebUITabStripContextMenuAfterTapDescription[];
- #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)
- 
-+extern const char kEnableVibrationName[];
-+extern const char kEnableVibrationDescription[];
- #if defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
- 
- extern const char kAutofillCreditCardUploadName[];
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
@@ -66,33 +28,34 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 #endif
 
 #if BUILDFLAG(IS_ANDROID)
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -106,6 +106,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls,
- #endif
- );
- 
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-vibration.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-vibration.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-vibration.inc
+@@ -0,0 +1,8 @@
+#ifdef FLAG_SECTION
+
+    {"enable-vibration",
+     "Vibration",
+     "Enable vibration API; an user gesture will still be needed.", kOsAll,
+     FEATURE_VALUE_TYPE(features::kVibration)},
+
+#endif
+diff --git a/cromite_flags/content/public/common/content_features_cc/Add-flag-to-disable-vibration.inc b/cromite_flags/content/public/common/content_features_cc/Add-flag-to-disable-vibration.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Add-flag-to-disable-vibration.inc
+@@ -0,0 +1,4 @@
 +// Enables vibration; an user gesture will still be required if enabled.
-+BASE_FEATURE(kVibration,
-+             "VibrationEnabled",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- // When this feature is enabled, private network requests initiated from
- // non-secure contexts in the `public` address space  are blocked.
- //
-diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
--- a/content/public/common/content_features.h
-+++ b/content/public/common/content_features.h
-@@ -311,6 +311,8 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kForceOffTextAutosizing);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kUserMediaScreenCapturing);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebNfc);
- #endif  // BUILDFLAG(IS_ANDROID)
+CROMITE_FEATURE(kVibration,
+               "VibrationEnabled",
+               base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/content/public/common/content_features_h/Add-flag-to-disable-vibration.inc b/cromite_flags/content/public/common/content_features_h/Add-flag-to-disable-vibration.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_h/Add-flag-to-disable-vibration.inc
+@@ -0,0 +1 @@
 +CONTENT_EXPORT BASE_DECLARE_FEATURE(kVibration);
-+
- 
- #if BUILDFLAG(IS_MAC)
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kMacAllowBackgroundingRenderProcesses);
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -25,17 +25,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../endpoint_fetcher_android.cc               |  50 ++++
 .../endpoint_fetcher/EndpointFetcher.java     |  26 +-
 .../EndpointHeaderResponse.java               |  31 ++
- .../flags/android/chrome_feature_list.cc      |   5 +
- .../flags/android/chrome_feature_list.h       |   1 +
+ .../flags/android/chrome_feature_list.cc      |   1 +
 .../browser/flags/ChromeFeatureList.java      |   1 +
 .../strings/android_chrome_strings.grd        |  23 +-
 .../endpoint_fetcher/endpoint_fetcher.cc      | 103 ++++++-
 .../endpoint_fetcher/endpoint_fetcher.h       |  23 +-
- 23 files changed, 933 insertions(+), 50 deletions(-)
+ .../Bromite-auto-updater.inc                  |   3 +
+ .../Bromite-auto-updater.inc                  |   1 +
+ 24 files changed, 932 insertions(+), 50 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
 create mode 100644 chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointHeaderResponse.java
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Bromite-auto-updater.inc

 diff --git a/build/android/java/templates/BuildConfig.template b/build/android/java/templates/BuildConfig.template
 --- a/build/android/java/templates/BuildConfig.template
@@ -1291,28 +1294,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
     &kBookmarksImprovedSaveFlow,
     &kBookmarksRefresh,
     &kOmahaMinSdkVersionAndroid,
-@@ -722,6 +723,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens,
-              "ContextMenuTranslateWithGoogleLens",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+BASE_FEATURE(kInlineUpdateFlow,
-+             "InlineUpdateFlow",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
- BASE_FEATURE(kLensCameraAssistedSearch,
-              "LensCameraAssistedSearch",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
-+++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -118,6 +118,7 @@ BASE_DECLARE_FEATURE(kGridTabSwitcherLandscapeAspectRatioPhones);
- BASE_DECLARE_FEATURE(kHideTabOnTabSwitcher);
- BASE_DECLARE_FEATURE(kImprovedIncognitoScreenshot);
- BASE_DECLARE_FEATURE(kIncognitoReauthenticationForAndroid);
-+BASE_DECLARE_FEATURE(kInlineUpdateFlow);
- BASE_DECLARE_FEATURE(kIncognitoScreenshot);
- BASE_DECLARE_FEATURE(kInfobarScrollOptimization);
- BASE_DECLARE_FEATURE(kImprovedA2HS);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -1626,5 +1607,19 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
   base::WeakPtrFactory<EndpointFetcher> weak_ptr_factory_{this};
 };
 
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kInlineUpdateFlow,
+                "InlineUpdateFlow",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Bromite-auto-updater.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Bromite-auto-updater.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Bromite-auto-updater.inc
+@@ -0,0 +1 @@
+BASE_DECLARE_FEATURE(kInlineUpdateFlow);
 --
 2.25.1
@@ -51,8 +51,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/verified_ruleset_dealer.cc        |   4 +
 .../browser/subresource_filter_features.cc    | 116 +-------
 .../core/common/indexed_ruleset.cc            |   5 +-
- third_party/blink/common/features.cc          |  12 +-
- 40 files changed, 1211 insertions(+), 135 deletions(-)
+ .../Bromite-subresource-adblocker.inc         |   3 +
+ 40 files changed, 1208 insertions(+), 129 deletions(-)
 create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
 create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -63,6 +63,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 create mode 100644 components/component_updater/adblock_updater_service.h
 create mode 100644 components/component_updater/download_filters_task.cc
 create mode 100644 components/component_updater/download_filters_task.h
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc

 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
@@ -1945,41 +1946,13 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
     return flat::VerifyIndexedRulesetBuffer(verifier)
                ? VerifyStatus::kChecksumFailVerifierPass
                : VerifyStatus::kChecksumFailVerifierFail;
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -158,8 +158,8 @@ BASE_FEATURE(kAutofillUseDomNodeIdForRendererId,
- // Apply lazy-loading to ad frames which have embeds likely impacting Core Web
- // Vitals.
- BASE_FEATURE(kAutomaticLazyFrameLoadingToAds,
-             "AutomaticLazyFrameLoadingToAds",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "AutomaticLazyFrameLoadingToAds",       // must be enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);      // in Bromite
- 
- // The timeout value that forces loading iframes that are lazy loaded by
- // LazyAds. After this timeout, the frame loading is triggered even when the
-@@ -179,8 +179,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyAds(
- // Apply lazy-loading to frames which have embeds likely impacting Core Web
- // Vitals.
- BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds,
-             "AutomaticLazyFrameLoadingToEmbeds",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "AutomaticLazyFrameLoadingToEmbeds",    // must be enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);      // in Bromite
- 
- // The timeout value that forces loading iframes that are lazy loaded by
- // LazyEmbeds. After this timeout, the frame loading is triggered even when the
-@@ -202,8 +202,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyEmbeds(
- // to gather Blink.AutomaticLazyLoadFrame.LazyEmbedFrameCount UKM data even when
- // kAutomaticLazyFrameLoadingToEmbeds is disabled.
- BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbedUrls,
-             "AutomaticLazyFrameLoadingToEmbedUrls",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "AutomaticLazyFrameLoadingToEmbedUrls",    // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);        // in Bromite
- 
- // Define the strategy for LazyEmbeds to decide which frames we apply
- // lazy-loading or not. If the loading strategy is kAllowList, the detection
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc b/cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc
+@@ -0,0 +1,3 @@
+SET_CROMITE_FEATURE_ENABLED(kAutomaticLazyFrameLoadingToAds);
+SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbeds);
+SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbedUrls);
 --
 2.25.1
@@ -4,22 +4,19 @@ Subject: Disable DRM media origin IDs preprovisioning

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- media/base/media_switches.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ .../disable-DRM-media-origin-IDs-preprovisioning.inc         | 5 +++++
+ 1 file changed, 5 insertions(+)
+ create mode 100644 cromite_flags/media/base/media_switches_cc/disable-DRM-media-origin-IDs-preprovisioning.inc

-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
-@@ -1135,8 +1135,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
- // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
- // which will trigger provisioning process after MediaDrmBridge is created.
- BASE_FEATURE(kMediaDrmPreprovisioning,
-             "MediaDrmPreprovisioning",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "MediaDrmPreprovisioning",             // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
- 
- // Determines if MediaDrmOriginIdManager should attempt to pre-provision origin
- // IDs at startup (whenever a profile is loaded). Also used by tests that
+diff --git a/cromite_flags/media/base/media_switches_cc/disable-DRM-media-origin-IDs-preprovisioning.inc b/cromite_flags/media/base/media_switches_cc/disable-DRM-media-origin-IDs-preprovisioning.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/media/base/media_switches_cc/disable-DRM-media-origin-IDs-preprovisioning.inc
+@@ -0,0 +1,5 @@
+#if BUILDFLAG(IS_ANDROID)
+
+SET_CROMITE_FEATURE_DISABLED(kMediaDrmPreprovisioning);
+
+#endif
 --
 2.25.1
@@ -16,10 +16,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../privacy_sandbox/privacy_sandbox_prompt.cc |  1 +
 .../history/core/browser/history_backend.cc   | 13 +---------
 .../privacy_sandbox_attestations.cc           |  1 +
- .../privacy_sandbox_features.cc               | 14 +++++------
+ .../privacy_sandbox_features.cc               |  4 ++++
 .../privacy_sandbox/privacy_sandbox_prefs.cc  |  2 +-
 .../privacy_sandbox_settings_impl.cc          | 24 +++++++++++++------
- 9 files changed, 33 insertions(+), 27 deletions(-)
+ 9 files changed, 30 insertions(+), 20 deletions(-)

 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
@@ -104,48 +104,15 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_san
 diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc
 --- a/components/privacy_sandbox/privacy_sandbox_features.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_features.cc
-@@ -12,8 +12,8 @@ BASE_FEATURE(kPrivacySandboxSuppressDialogOnNonNormalBrowsers,
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -126,4 +126,8 @@ BASE_FEATURE(kTrackingProtectionOnboardingForceEligibility,
+              "TrackingProtectionOnboardingForceEligibility",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 
- BASE_FEATURE(kPrivacySandboxSettings4,
-             "PrivacySandboxSettings4",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PrivacySandboxSettings4",          // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT); // in bromite
- 
- const char kPrivacySandboxSettings4ConsentRequiredName[] = "consent-required";
- const char kPrivacySandboxSettings4NoticeRequiredName[] = "notice-required";
-@@ -74,8 +74,8 @@ const base::FeatureParam<bool> kPrivacySandboxSettings4CloseAllPrompts{
-     &kPrivacySandboxSettings4, "close-all-prompts", true};
- 
- BASE_FEATURE(kPrivacySandboxSettings3,
-             "PrivacySandboxSettings3",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PrivacySandboxSettings3",          // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT); // in bromite
- const base::FeatureParam<bool> kPrivacySandboxSettings3ConsentRequired{
-     &kPrivacySandboxSettings3, "consent-required", false};
- const base::FeatureParam<bool> kPrivacySandboxSettings3NoticeRequired{
-@@ -98,7 +98,7 @@ BASE_FEATURE(kOverridePrivacySandboxSettingsLocalTesting,
- 
- BASE_FEATURE(kDisablePrivacySandboxPrompts,
-              "DisablePrivacySandboxPrompts",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kPrivacySandboxFirstPartySetsUI,
-              "PrivacySandboxFirstPartySetsUI",
-@@ -107,8 +107,8 @@ const base::FeatureParam<bool> kPrivacySandboxFirstPartySetsUISampleSets{
-     &kPrivacySandboxFirstPartySetsUI, "use-sample-sets", false};
- 
- BASE_FEATURE(kEnforcePrivacySandboxAttestations,
-             "EnforcePrivacySandboxAttestations",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "EnforcePrivacySandboxAttestations",  // if enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);    // log to console
- 
- const char kPrivacySandboxEnrollmentOverrides[] =
-     "privacy-sandbox-enrollment-overrides";
+SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxSettings4);
+SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxSettings3);
+SET_CROMITE_FEATURE_ENABLED(kDisablePrivacySandboxPrompts);
+SET_CROMITE_FEATURE_ENABLED(kEnforcePrivacySandboxAttestations); // if enabled log to console
+ }  // namespace privacy_sandbox
 diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
 --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -12,11 +12,11 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 chrome/android/java/AndroidManifest.xml       |   1 -
- components/attribution_reporting/features.cc  |   4 +-
- .../origin_trials/features.cc                 |   8 +-
+ components/attribution_reporting/features.cc  |   1 +
+ .../origin_trials/features.cc                 |   2 +
 .../render_view_context_menu_base.cc          |   3 -
 .../aggregatable_report_sender.cc             |  15 +-
- .../aggregation_service_features.cc           |   4 +-
+ .../aggregation_service_features.cc           |   1 +
 .../attribution_data_host_manager_impl.cc     |   5 +
 .../attribution_reporting/attribution_host.cc |   1 +
 .../attribution_os_level_manager.cc           |   1 +
@@ -27,16 +27,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/AttributionOsLevelManager.java    | 218 +-----------------
 .../public/browser/content_browser_client.cc  |   6 +-
 .../public/browser/navigation_controller.cc   |   1 -
- content/public/common/content_features.cc     |   4 +-
 content/renderer/render_thread_impl.cc        |   5 +-
+ .../Disable-conversion-measurement-api.inc    |   1 +
+ .../Disable-conversion-measurement-api.inc    |   1 +
+ .../Disable-conversion-measurement-api.inc    |  10 +
 .../attribution/request_headers_internal.cc   |   1 +
 .../network/public/cpp/attribution_utils.cc   |   2 +
- services/network/public/cpp/features.cc       |   6 +-
- third_party/blink/common/features.cc          |  38 +--
- .../platform/runtime_enabled_features.json5   |   7 +
- ui/base/ui_base_features.cc                   |   2 +-
 ui/events/android/motion_event_android.cc     |   6 +-
- 25 files changed, 92 insertions(+), 274 deletions(-)
+ 23 files changed, 68 insertions(+), 241 deletions(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-conversion-measurement-api.inc
+ create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc

 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
@@ -52,35 +53,21 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/components/attribution_reporting/features.cc b/components/attribution_reporting/features.cc
 --- a/components/attribution_reporting/features.cc
 +++ b/components/attribution_reporting/features.cc
-@@ -10,8 +10,8 @@ namespace attribution_reporting::features {
- 
- // Controls whether the Conversion Measurement API infrastructure is enabled.
- BASE_FEATURE(kConversionMeasurement,
-             "ConversionMeasurement",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "ConversionMeasurement",            // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT); // by default
- 
- BASE_FEATURE(kAttributionReportingNullAggregatableReports,
+@@ -17,4 +17,5 @@ BASE_FEATURE(kAttributionReportingNullAggregatableReports,
              "AttributionReportingNullAggregatableReports",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+SET_CROMITE_FEATURE_DISABLED(kConversionMeasurement);
+ }  // namespace attribution_reporting::features
 diff --git a/components/embedder_support/origin_trials/features.cc b/components/embedder_support/origin_trials/features.cc
 --- a/components/embedder_support/origin_trials/features.cc
 +++ b/components/embedder_support/origin_trials/features.cc
-@@ -14,11 +14,11 @@ namespace embedder_support {
- // Users from control group will have the feature disabled, excluding them
- // from the origin trial.
- BASE_FEATURE(kOriginTrialsSampleAPIThirdPartyAlternativeUsage,
-             "OriginTrialsSampleAPIThirdPartyAlternativeUsage",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OriginTrialsSampleAPIThirdPartyAlternativeUsage",   // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);                  // in Bromite
- 
- BASE_FEATURE(kConversionMeasurementAPIAlternativeUsage,
-             "ConversionMeasurementAPIAlternativeUsage",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "ConversionMeasurementAPIAlternativeUsage",          // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);                  // in Bromite
+@@ -21,4 +21,6 @@ BASE_FEATURE(kConversionMeasurementAPIAlternativeUsage,
+              "ConversionMeasurementAPIAlternativeUsage",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 
+SET_CROMITE_FEATURE_DISABLED(kOriginTrialsSampleAPIThirdPartyAlternativeUsage);
+SET_CROMITE_FEATURE_DISABLED(kConversionMeasurementAPIAlternativeUsage);
 }  // namespace embedder_support
 diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
 --- a/components/renderer_context_menu/render_view_context_menu_base.cc
@@ -128,17 +115,12 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
 diff --git a/content/browser/aggregation_service/aggregation_service_features.cc b/content/browser/aggregation_service/aggregation_service_features.cc
 --- a/content/browser/aggregation_service/aggregation_service_features.cc
 +++ b/content/browser/aggregation_service/aggregation_service_features.cc
-@@ -7,8 +7,8 @@
- namespace content {
+@@ -20,4 +20,5 @@ BASE_FEATURE(kPrivacySandboxAggregationServiceReportPadding,
+              "PrivacySandboxAggregationServiceReportPadding",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 
- BASE_FEATURE(kPrivacySandboxAggregationService,
-             "PrivacySandboxAggregationService",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PrivacySandboxAggregationService",   // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);   // in bromite
- 
- const base::FeatureParam<std::string>
-     kPrivacySandboxAggregationServiceTrustedServerUrlAwsParam{
+SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAggregationService);
+ }  // namespace content
 diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 --- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 +++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
@@ -592,20 +574,6 @@ diff --git a/content/public/browser/navigation_controller.cc b/content/public/br
       is_pdf(input.is_pdf) {
 #if DCHECK_IS_ON()
   DCHECK(input.Valid());
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -648,8 +648,8 @@ BASE_FEATURE(kPrefetchNewLimits,
- // FLEDGE, Topics, along with a number of other features actively in development
- // within these APIs.
- BASE_FEATURE(kPrivacySandboxAdsAPIsOverride,
-             "PrivacySandboxAdsAPIsOverride",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "PrivacySandboxAdsAPIsOverride",       // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in bromite
- 
- // Enables Private Network Access checks for all types of web workers.
- //
 diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
@@ -628,6 +596,33 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th
 }
 
 std::unique_ptr<CodecFactory> RenderThreadImpl::CreateMediaCodecFactory(
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-conversion-measurement-api.inc b/cromite_flags/content/public/common/content_features_cc/Disable-conversion-measurement-api.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-conversion-measurement-api.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAdsAPIsOverride);
+diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kAttributionReportingCrossAppWeb);
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
+@@ -0,0 +1,10 @@
+SET_CROMITE_FEATURE_DISABLED(kAdAuctionReportingWithMacroApi);
+SET_CROMITE_FEATURE_DISABLED(kAdAuctionSignals);
+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsDocumentAPI);
+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsParameters);
+SET_CROMITE_FEATURE_DISABLED(kFledgeBiddingAndAuctionServer);
+SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
+SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAdsAPIs);
+SET_CROMITE_FEATURE_DISABLED(kPrivateAggregationApi);
+
 diff --git a/services/network/attribution/request_headers_internal.cc b/services/network/attribution/request_headers_internal.cc
 --- a/services/network/attribution/request_headers_internal.cc
 +++ b/services/network/attribution/request_headers_internal.cc
@@ -658,147 +653,6 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
   switch (attribution_support) {
     case mojom::AttributionSupport::kWeb:
     case mojom::AttributionSupport::kWebAndOs:
-diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
--- a/services/network/public/cpp/features.cc
-+++ b/services/network/public/cpp/features.cc
-@@ -155,9 +155,9 @@ BASE_FEATURE(kAttributionReportingReportVerification,
- 
- // Gate access to Attribution Reporting cross app and web APIs that allow
- // registering with a native attribution API.
-BASE_FEATURE(kAttributionReportingCrossAppWeb,
-             "AttributionReportingCrossAppWeb",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+BASE_FEATURE(kAttributionReportingCrossAppWeb,    // in bromite
-+             "AttributionReportingCrossAppWeb",   // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // by default
- 
- // Enables preprocessing requests with the Private State Tokens API Fetch flags
- // set, and handling their responses, according to the protocol.
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -36,14 +36,14 @@ BASE_FEATURE(kAcceleratedStaticBitmapImageSerialization,
- 
- // Enable the Protected Audience's reporting with ad macro API.
- BASE_FEATURE(kAdAuctionReportingWithMacroApi,
-             "AdAuctionReportingWithMacroApi",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "AdAuctionReportingWithMacroApi",   // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT); // by default
- 
- // Controls the capturing of the Ad-Auction-Signals header, and the maximum
- // allowed Ad-Auction-Signals header value.
- BASE_FEATURE(kAdAuctionSignals,
-             "AdAuctionSignals",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "AdAuctionSignals",                 // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT); // by default
- const base::FeatureParam<int> kAdAuctionSignalsMaxSizeBytes{
-     &kAdAuctionSignals, "ad-auction-signals-max-size-bytes", 10000};
- 
-@@ -308,8 +308,8 @@ const base::FeatureParam<int> kBoostImagePriorityTightMediumLimit{
- // https://github.com/patcg-individual-drafts/topics
- // Kill switch for the Topics API.
- BASE_FEATURE(kBrowsingTopics,
-             "BrowsingTopics",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "BrowsingTopics",                      // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // by default
- 
- // If enabled, the check for whether the IP address is publicly routable will be
- // bypassed when determining the eligibility for a page to be included in topics
-@@ -324,14 +324,14 @@ BASE_FEATURE(kBrowsingTopicsBypassIPIsPubliclyRoutableCheck,
- // either a valid Origin Trial token exists or `kPrivacySandboxAdsAPIsOverride`
- // is enabled.)
- BASE_FEATURE(kBrowsingTopicsDocumentAPI,
-             "BrowsingTopicsDocumentAPI",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "BrowsingTopicsDocumentAPI",           // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // by default
- 
- // Decoupled with the main `kBrowsingTopics` feature, so it allows us to
- // decouple the server side configs.
- BASE_FEATURE(kBrowsingTopicsParameters,
-             "BrowsingTopicsParameters",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "BrowsingTopicsParameters",            // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // by default
- // The number of epochs from where to calculate the topics to give to a
- // requesting contexts.
- const base::FeatureParam<int> kBrowsingTopicsNumberOfEpochsToExpose{
-@@ -807,8 +807,8 @@ BASE_FEATURE(kFledge, "Fledge", base::FEATURE_DISABLED_BY_DEFAULT);
- // See
- // https://github.com/WICG/turtledove/blob/main/FLEDGE_browser_bidding_and_auction_API.md
- BASE_FEATURE(kFledgeBiddingAndAuctionServer,
-             "FledgeBiddingAndAuctionServer",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "FledgeBiddingAndAuctionServer",       // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // by default
- const base::FeatureParam<std::string> kFledgeBiddingAndAuctionKeyURL{
-     &kFledgeBiddingAndAuctionServer, "FledgeBiddingAndAuctionKeyURL", ""};
- 
-@@ -973,8 +973,8 @@ const char kIntensiveWakeUpThrottling_GracePeriodSeconds_Name[] =
- // Kill switch for the Interest Group API, i.e. if disabled, the
- // API exposure will be disabled regardless of the OT config.
- BASE_FEATURE(kInterestGroupStorage,
-             "InterestGroupStorage",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "InterestGroupStorage",              // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // by default
- // TODO(crbug.com/1197209): Adjust these limits in response to usage.
- const base::FeatureParam<int> kInterestGroupStorageMaxOwners{
-     &kInterestGroupStorage, "max_owners", 1000};
-@@ -1403,16 +1403,16 @@ const base::FeatureParam<bool> kPrewarmFantasy = {&kPrewarmDefaultFontFamilies,
-                                                   "prewarm_fantasy", false};
- #endif
- 
-BASE_FEATURE(kPrivacySandboxAdsAPIs,
-             "PrivacySandboxAdsAPIs",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+BASE_FEATURE(kPrivacySandboxAdsAPIs,                // disabled
-+             "PrivacySandboxAdsAPIs",               // by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in bromite
- 
- // Enables the Private Aggregation API. Note that this API also requires the
- // `kPrivacySandboxAggregationService` to be enabled to successfully send
- // reports.
- BASE_FEATURE(kPrivateAggregationApi,
-             "PrivateAggregationApi",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "PrivateAggregationApi",               // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in bromite
- 
- // Selectively allows the JavaScript API to be disabled in just one of the
- // contexts. The Protected Audience param's name has not been updated (from
-diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
-+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -198,6 +198,13 @@
-   },
- 
-   data: [
-+    {
-+      // disable by default features by marking as
-+      // depends_on: ["DisabledForBromite"]
-+      // to work is needed to remove "origin_trial_feature_name"
-+      // and "origin_trial_allows_third_party"
-+      name: "DisabledForBromite",
-+    },
-     {
-       name: "AbortSignalAny",
-       status: "stable",
-diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
--- a/ui/base/ui_base_features.cc
-+++ b/ui/base/ui_base_features.cc
-@@ -626,7 +626,7 @@ BASE_FEATURE(kMacClipboardWriteImageWithPng,
- // We want to experiment with disabling it to align with CR2023 designs.
- BASE_FEATURE(kCr2023MacFontSmoothing,
-              "Cr2023MacFontSmoothing",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
- 
- }  // namespace features
 diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motion_event_android.cc
 --- a/ui/events/android/motion_event_android.cc
 +++ b/ui/events/android/motion_event_android.cc
@@ -3,9 +3,10 @@ Date: Sat, 9 Apr 2022 21:43:35 +0200
 Subject: Disable crash reporting

 ---
- chrome/browser/chrome_content_browser_client.cc | 1 +
- content/public/common/content_features.cc       | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ chrome/browser/chrome_content_browser_client.cc                  | 1 +
+ .../common/content_features_cc/Disable-crash-reporting.inc       | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-crash-reporting.inc

 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
@@ -18,19 +19,11 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
   if (enable_crash_reporter) {
     std::string switch_value;
     std::unique_ptr<metrics::ClientInfo> client_info =
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -215,8 +215,8 @@ BASE_FEATURE(kCooperativeScheduling,
- // Enables crash reporting via Reporting API.
- // https://www.w3.org/TR/reporting/#crash-report
- BASE_FEATURE(kCrashReporting,
-             "CrashReporting",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "CrashReporting",                      // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
- 
- // Enable the device posture API.
- // Tracking bug for enabling device posture API: https://crbug.com/1066842.
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-crash-reporting.inc b/cromite_flags/content/public/common/content_features_cc/Disable-crash-reporting.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-crash-reporting.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kCrashReporting);
 --
 2.25.1
@@ -7,8 +7,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../chromium/chrome/browser/feed/FeedFeatures.java  |  8 +-------
 chrome/browser/prefs/browser_prefs.cc               |  4 ++--
 components/feed/core/common/pref_names.cc           | 13 +------------
- components/feed/feed_feature_list.cc                |  4 ++--
- 4 files changed, 6 insertions(+), 23 deletions(-)
+ components/feed/feed_feature_list.cc                |  2 ++
+ 4 files changed, 6 insertions(+), 21 deletions(-)

 diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
 --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
@@ -70,16 +70,12 @@ diff --git a/components/feed/core/common/pref_names.cc b/components/feed/core/co
 diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
 --- a/components/feed/feed_feature_list.cc
 +++ b/components/feed/feed_feature_list.cc
-@@ -20,8 +20,8 @@ namespace feed {
- // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is
- // changed, please update the cached one's default value in CachedFeatureFlags.
- BASE_FEATURE(kInterestFeedV2,
-             "InterestFeedV2",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "InterestFeedV2",                          // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
+@@ -163,4 +163,6 @@ BASE_FEATURE(kFeedSportsCard,
+              "FeedSportsCard",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 
- BASE_FEATURE(kInterestFeedV2Autoplay,
-              "InterestFeedV2Autoplay",
+SET_CROMITE_FEATURE_DISABLED(kInterestFeedV2);
+SET_CROMITE_FEATURE_DISABLED(kWebFeed);
+ }  // namespace feed
 --
 2.25.1
@@ -22,10 +22,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../variations/service/variations_service.cc  | 15 ++-------
 .../browser/loader/url_loader_throttles.cc    |  7 ----
 .../origin_trials/origin_trials_utils.cc      |  2 +-
- content/public/common/content_features.cc     |  4 +--
 .../variations_render_thread_observer.cc      |  9 ------
+ .../Disable-fetching-of-all-field-trials.inc  |  1 +
 .../renderer/core/loader/document_loader.cc   |  7 ----
- 18 files changed, 29 insertions(+), 82 deletions(-)
+ 18 files changed, 28 insertions(+), 80 deletions(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-fetching-of-all-field-trials.inc

 diff --git a/android_webview/common/aw_features.cc b/android_webview/common/aw_features.cc
 --- a/android_webview/common/aw_features.cc
@@ -327,20 +328,6 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow
     return {};
   }
   size_t iter = 0;
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -630,8 +630,8 @@ BASE_FEATURE(kPepperCrossOriginRedirectRestriction,
- // things before receiving the response, for instance it can affect the next
- // navigation's network request.
- BASE_FEATURE(kPersistentOriginTrials,
-             "PersistentOriginTrials",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PersistentOriginTrials",            // always disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in bromite
- 
- // If enabled, then an updated prefetch request limit policy will be used that
- // separates eager and non-eager prefetches, and allows for evictions.
 diff --git a/content/renderer/variations_render_thread_observer.cc b/content/renderer/variations_render_thread_observer.cc
 --- a/content/renderer/variations_render_thread_observer.cc
 +++ b/content/renderer/variations_render_thread_observer.cc
@@ -360,6 +347,12 @@ diff --git a/content/renderer/variations_render_thread_observer.cc b/content/ren
 }
 
 void VariationsRenderThreadObserver::RegisterMojoInterfaces(
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-fetching-of-all-field-trials.inc b/cromite_flags/content/public/common/content_features_cc/Disable-fetching-of-all-field-trials.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-fetching-of-all-field-trials.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kPersistentOriginTrials);
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -4,26 +4,21 @@ Subject: Disable idle detection

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- content/public/common/content_features.cc                  | 2 +-
+ .../common/content_features_cc/Disable-idle-detection.inc  | 1 +
 .../blink/renderer/platform/runtime_enabled_features.json5 | 7 +++----
- 2 files changed, 4 insertions(+), 5 deletions(-)
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-idle-detection.inc

-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -448,7 +448,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
- // This is intended as a kill switch for the Idle Detection feature. To enable
- // this feature, the experimental web platform features flag should be set,
- // or the site should obtain an Origin Trial token.
-BASE_FEATURE(kIdleDetection, "IdleDetection", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kIdleDetection, "IdleDetection", base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // Kill switch for the GetInstalledRelatedApps API.
- BASE_FEATURE(kInstalledApp, "InstalledApp", base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-idle-detection.inc b/cromite_flags/content/public/common/content_features_cc/Disable-idle-detection.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-idle-detection.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kIdleDetection);
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2075,10 +2075,9 @@
+@@ -2068,10 +2068,9 @@
       base_feature: "none",
     },
     {
@@ -5,23 +5,14 @@ Subject: Disable media router and remoting by default
 Original License: MIT - https://spdx.org/licenses/MIT.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/media/router/media_router_feature.cc          | 5 +++--
- chrome/browser/profiles/profile_impl.cc                      | 2 +-
- .../blink/renderer/modules/remoteplayback/remote_playback.cc | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
+ chrome/browser/media/router/media_router_feature.cc         | 6 +++++-
+ chrome/browser/profiles/profile_impl.cc                     | 2 +-
+ .../renderer/modules/remoteplayback/remote_playback.cc      | 2 +-
+ 3 files changed, 7 insertions(+), 3 deletions(-)

 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -38,7 +38,7 @@
- namespace media_router {
- 
- #if !BUILDFLAG(IS_ANDROID)
-BASE_FEATURE(kMediaRouter, "MediaRouter", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kMediaRouter, "MediaRouter", base::FEATURE_DISABLED_BY_DEFAULT);
- BASE_FEATURE(kCastAllowAllIPsFeature,
-              "CastAllowAllIPs",
-              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -106,6 +106,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
 }
 
@@ -39,6 +30,14 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
   registry->RegisterBooleanPref(
       media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,
       true);
+@@ -218,4 +219,7 @@ absl::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {
+ 
+ #endif  // !BUILDFLAG(IS_ANDROID)
+ 
+#if !BUILDFLAG(IS_ANDROID)
+SET_CROMITE_FEATURE_DISABLED(kMediaRouter);
+#endif
+ }  // namespace media_router
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
@@ -4,22 +4,15 @@ Subject: Disable offline pages in CCT

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/offline_pages/core/offline_page_feature.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ .../offline_page_feature_cc/Disable-offline-pages-in-CCT.inc     | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cromite_flags/components/offline_pages/core/offline_page_feature_cc/Disable-offline-pages-in-CCT.inc

-diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
--- a/components/offline_pages/core/offline_page_feature.cc
-+++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -37,8 +37,8 @@ BASE_FEATURE(kOfflinePagesDescriptivePendingStatusFeature,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kOfflinePagesInDownloadHomeOpenInCctFeature,
-             "OfflinePagesInDownloadHomeOpenInCct",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OfflinePagesInDownloadHomeOpenInCct",       // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
- 
- BASE_FEATURE(kOfflinePagesNetworkStateLikelyUnknown,
-              "OfflinePagesNetworkStateLikelyUnknown",
+diff --git a/cromite_flags/components/offline_pages/core/offline_page_feature_cc/Disable-offline-pages-in-CCT.inc b/cromite_flags/components/offline_pages/core/offline_page_feature_cc/Disable-offline-pages-in-CCT.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/components/offline_pages/core/offline_page_feature_cc/Disable-offline-pages-in-CCT.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kOfflinePagesInDownloadHomeOpenInCctFeature);
 --
 2.25.1
@@ -10,13 +10,15 @@ the ChromeSmartSelection feature flag.

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../contextualsearch/SelectionClientManager.java  |  4 +++-
- .../browser/flags/android/chrome_feature_list.cc  |  5 +++++
- .../browser/flags/android/chrome_feature_list.h   |  1 +
- .../chrome/browser/flags/ChromeFeatureList.java   |  1 +
- .../selection/SelectionPopupControllerImpl.java   |  2 +-
- testing/variations/fieldtrial_testing_config.json | 15 +++++++++++++++
- 6 files changed, 26 insertions(+), 2 deletions(-)
+ .../browser/contextualsearch/SelectionClientManager.java      | 4 +++-
+ chrome/browser/flags/android/chrome_feature_list.cc           | 1 +
+ .../org/chromium/chrome/browser/flags/ChromeFeatureList.java  | 1 +
+ .../browser/selection/SelectionPopupControllerImpl.java       | 2 +-
+ .../disable-smart-selection-by-default.inc                    | 3 +++
+ .../disable-smart-selection-by-default.inc                    | 1 +
+ 6 files changed, 10 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-smart-selection-by-default.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/disable-smart-selection-by-default.inc

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
@@ -50,28 +52,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
     &kCCTIncognitoAvailableToThirdParty,
     &kCCTIntentFeatureOverrides,
     &kCCTMinimized,
-@@ -1059,6 +1060,10 @@ BASE_FEATURE(kTabEngagementReportingAndroid,
-              "TabEngagementReportingAndroid",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+BASE_FEATURE(kChromeSmartSelection,
-+             "ChromeSmartSelection",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- BASE_FEATURE(kTabStripRedesign,
-              "TabStripRedesign",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
-+++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -78,6 +78,7 @@ BASE_DECLARE_FEATURE(kCCTToolbarCustomizations);
- BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls);
- BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting);
- BASE_DECLARE_FEATURE(kChromeNewDownloadTab);
-+BASE_DECLARE_FEATURE(kChromeSmartSelection);
- BASE_DECLARE_FEATURE(kChromeShareScreenshot);
- BASE_DECLARE_FEATURE(kChromeSharingHub);
- BASE_DECLARE_FEATURE(kChromeSharingHubLaunchAdjacent);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -95,30 +75,19 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 && isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH);
     }
 
-diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
-+++ b/testing/variations/fieldtrial_testing_config.json
-@@ -4088,6 +4088,21 @@
-             ]
-         }
-     ],
-+    "ChromeSmartSelection": [
-+        {
-+            "platforms": [
-+                "android"
-+            ],
-+            "experiments": [
-+                {
-+                    "name": "Enabled_Launch",
-+                    "enable_features": [
-+                        "ChromeSmartSelection"
-+                    ]
-+                }
-+            ]
-+        }
-+    ],
-     "CommerceHintAndroid": [
-         {
-             "platforms": [
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-smart-selection-by-default.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-smart-selection-by-default.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-smart-selection-by-default.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kChromeSmartSelection,
+               "ChromeSmartSelection",
+               base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/disable-smart-selection-by-default.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/disable-smart-selection-by-default.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/disable-smart-selection-by-default.inc
+@@ -0,0 +1 @@
+BASE_DECLARE_FEATURE(kChromeSmartSelection);
 --
 2.25.1
@@ -4,37 +4,23 @@ Subject: Disable some signed exchange features

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- content/common/features.cc                | 4 ++--
- content/public/common/content_features.cc | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ .../common/features_cc/Disable-some-signed-exchange-features.inc | 1 +
+ .../Disable-some-signed-exchange-features.inc                    | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 cromite_flags/content/common/features_cc/Disable-some-signed-exchange-features.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-some-signed-exchange-features.inc

-diff --git a/content/common/features.cc b/content/common/features.cc
--- a/content/common/features.cc
-+++ b/content/common/features.cc
-@@ -432,8 +432,8 @@ const base::FeatureParam<std::string>
- // Signed Exchange Reporting for distributors
- // https://www.chromestatus.com/feature/5687904902840320
- BASE_FEATURE(kSignedExchangeReportingForDistributors,
-             "SignedExchangeReportingForDistributors",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "SignedExchangeReportingForDistributors",  // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);        // by default
- 
- // When enabled, ensures that an unlocked process cannot access data for
- // sites that require a dedicated process.
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -934,8 +934,8 @@ BASE_FEATURE(kShouldAllowFirstPartyStorageKeyOverrideFromEmbedder,
- // Origin-Signed HTTP Exchanges (for WebPackage Loading)
- // https://www.chromestatus.com/feature/5745285984681984
- BASE_FEATURE(kSignedHTTPExchange,
-             "SignedHTTPExchange",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "SignedHTTPExchange",                        // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
- 
- // If enabled, GetUserMedia API will only work when the concerned tab is in
- // focus
+diff --git a/cromite_flags/content/common/features_cc/Disable-some-signed-exchange-features.inc b/cromite_flags/content/common/features_cc/Disable-some-signed-exchange-features.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/common/features_cc/Disable-some-signed-exchange-features.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kSignedExchangeReportingForDistributors);
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-some-signed-exchange-features.inc b/cromite_flags/content/public/common/content_features_cc/Disable-some-signed-exchange-features.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Disable-some-signed-exchange-features.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kSignedHTTPExchange);
 --
 2.25.1
@@ -7,75 +7,18 @@ Revert "[Text Fragment] Unflag fragment directive removal."
 Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                                | 5 +++++
- chrome/browser/flag-metadata.json                            | 5 +++++
- chrome/browser/flag_descriptions.cc                          | 4 ++++
- chrome/browser/flag_descriptions.h                           | 3 +++
- chrome/browser/ui/prefs/prefs_tab_helper.cc                  | 2 +-
- content/child/runtime_features.cc                            | 2 ++
- third_party/blink/common/features.cc                         | 5 +++++
- third_party/blink/public/common/features.h                   | 1 +
- third_party/blink/renderer/core/dom/document.cc              | 5 +++++
- .../blink/renderer/platform/runtime_enabled_features.json5   | 5 ++---
- 10 files changed, 33 insertions(+), 4 deletions(-)
+ chrome/browser/ui/prefs/prefs_tab_helper.cc               | 2 +-
+ content/child/runtime_features.cc                         | 2 ++
+ .../about_flags_cc/Disable-text-fragments-by-default.inc  | 8 ++++++++
+ .../features_cc/Disable-text-fragments-by-default.inc     | 4 ++++
+ .../features_h/Disable-text-fragments-by-default.inc      | 1 +
+ third_party/blink/renderer/core/dom/document.cc           | 5 +++++
+ .../renderer/platform/runtime_enabled_features.json5      | 5 ++---
+ 7 files changed, 23 insertions(+), 4 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Disable-text-fragments-by-default.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-text-fragments-by-default.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_h/Disable-text-fragments-by-default.inc

-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
-@@ -7216,6 +7216,11 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kLegacyTechReportTopLevelUrlDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kLegacyTechReportTopLevelUrl)},
- 
-+    {"enable-text-fragment-anchor",
-+     flag_descriptions::kEnableTextFragmentAnchorName,
-+     flag_descriptions::kEnableTextFragmentAnchorDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(blink::features::kTextFragmentAnchor)},
-+
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-     {"enable-web-authentication-chromeos-authenticator",
-      flag_descriptions::kEnableWebAuthenticationChromeOSAuthenticatorName,
-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
-@@ -3255,6 +3255,11 @@
-     "owners": [ "robsc", "napper", "alanlxl" ],
-     "expiry_milestone": 130
-   },
-+  {
-+    "name": "enable-text-fragment-anchor",
-+    "owners": [ "bokan", "input-dev" ],
-+    "expiry_milestone": -1
-+  },
-   {
-     "name": "enable-neural-stylus-palm-rejection",
-     "owners": [ "robsc", "napper", "adlr" ],
-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
-@@ -1501,6 +1501,10 @@ const char kDropInputEventsBeforeFirstPaintDescription[] =
-     "intentionally interact with elements on that page. By dropping the events "
-     "we prevent accidental interaction with a page the user has not seen yet.";
- 
-+const char kEnableTextFragmentAnchorName[] = "Enable Text Fragment Anchor.";
-+const char kEnableTextFragmentAnchorDescription[] =
-+    "Enables scrolling to text specified in URL's fragment.";
-+
- const char kEnableCssSelectorFragmentAnchorName[] =
-     "Enables CSS selector fragment anchors";
- const char kEnableCssSelectorFragmentAnchorDescription[] =
-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
-@@ -843,6 +843,9 @@ extern const char kExperimentalRgbKeyboardPatternsDescription[];
- 
- extern const char kRetailCouponsName[];
- extern const char kRetailCouponsDescription[];
-+extern const char kEnableTextFragmentAnchorName[];
-+extern const char kEnableTextFragmentAnchorDescription[];
-+
- 
- extern const char kDropInputEventsBeforeFirstPaintName[];
- extern const char kDropInputEventsBeforeFirstPaintDescription[];
 diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
 +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -100,32 +43,34 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
     {wf::EnableUserActivationSameOriginVisibility,
      raw_ref(features::kUserActivationSameOriginVisibility)},
     {wf::EnableVideoPlaybackQuality, raw_ref(features::kVideoPlaybackQuality)},
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -767,6 +767,11 @@ BASE_FEATURE(kFencedFramesM119Features,
-              "FencedFramesM119Features",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+// Enable text snippets in URL fragments. https://crbug.com/919204.
-+BASE_FEATURE(kTextFragmentAnchor,
-+             "TextFragmentAnchor",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Disable-text-fragments-by-default.inc b/cromite_flags/chrome/browser/about_flags_cc/Disable-text-fragments-by-default.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Disable-text-fragments-by-default.inc
+@@ -0,0 +1,8 @@
+#ifdef FLAG_SECTION
 +
- // File handling icons. https://crbug.com/1218213
- BASE_FEATURE(kFileHandlingIcons,
-              "FileHandlingIcons",
-diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
--- a/third_party/blink/public/common/features.h
-+++ b/third_party/blink/public/common/features.h
-@@ -351,6 +351,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDispatchBeforeUnloadOnFreeze);
- BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisplayLocking);
- 
- BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDropInputEventsBeforeFirstPaint);
+    {"enable-text-fragment-anchor",
+     "Enable Text Fragment Anchor.",
+     "Enables scrolling to text specified in URL's fragment.", kOsAll,
+     FEATURE_VALUE_TYPE(blink::features::kTextFragmentAnchor)},
+
+#endif
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-text-fragments-by-default.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-text-fragments-by-default.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-text-fragments-by-default.inc
+@@ -0,0 +1,4 @@
+// Enable text snippets in URL fragments. https://crbug.com/919204.
+CROMITE_FEATURE(kTextFragmentAnchor,
+                "TextFragmentAnchor",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/third_party/blink/common/features_h/Disable-text-fragments-by-default.inc b/cromite_flags/third_party/blink/common/features_h/Disable-text-fragments-by-default.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_h/Disable-text-fragments-by-default.inc
+@@ -0,0 +1 @@
 +BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kTextFragmentAnchor);
- 
- BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDroppedTouchSequenceIncludesTouchEnd);
- 
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
@@ -13,13 +13,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../android/ntp/most_visited_sites_bridge.cc    | 17 -----------------
 chrome/browser/browser_process_impl.cc          |  2 +-
 chrome/browser/chrome_content_browser_client.cc | 15 ---------------
- .../chrome_metrics_services_manager_client.cc   |  8 ++++----
+ .../chrome_metrics_services_manager_client.cc   |  4 ++++
 .../browser/ui/search/ntp_user_data_logger.cc   |  4 ----
 components/ntp_tiles/BUILD.gn                   |  3 ---
 .../ntp_tiles/custom_links_manager_impl.cc      |  1 -
 components/ntp_tiles/most_visited_sites.cc      |  2 --
- services/metrics/public/cpp/ukm_recorder.cc     |  2 +-
- 10 files changed, 7 insertions(+), 49 deletions(-)
+ services/metrics/public/cpp/ukm_recorder.cc     |  1 +
+ 10 files changed, 7 insertions(+), 44 deletions(-)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
@@ -142,28 +142,17 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
-@@ -75,8 +75,8 @@ namespace internal {
- // recording and reporting are enabled. If the feature is enabled, but no
- // consent is given, then there will be no recording or reporting.
- BASE_FEATURE(kMetricsReportingFeature,
-             "MetricsReporting",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "MetricsReporting",                  // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
- 
- #if BUILDFLAG(IS_ANDROID)
- // Same as |kMetricsReportingFeature|, but this feature is associated with a
-@@ -85,8 +85,8 @@ BASE_FEATURE(kMetricsReportingFeature,
- // the fix to not affect the overall sampling rate, this new feature was
- // created. See crbug/1306481.
- BASE_FEATURE(kPostFREFixMetricsReportingFeature,
-             "PostFREFixMetricsReporting",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PostFREFixMetricsReporting",        // disabled by deault
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
- #endif  // BUILDFLAG(IS_ANDROID)
- 
+@@ -92,6 +92,10 @@ BASE_FEATURE(kPostFREFixMetricsReportingFeature,
 // Name of the variations param that defines the sampling rate.
+ const char kRateParamName[] = "sampling_rate_per_mille";
+ 
+SET_CROMITE_FEATURE_DISABLED(kMetricsReportingFeature);
+#if BUILDFLAG(IS_ANDROID)
+SET_CROMITE_FEATURE_DISABLED(kPostFREFixMetricsReportingFeature);
+#endif  // BUILDFLAG(IS_ANDROID)
+ }  // namespace internal
+ }  // namespace metrics
+ 
 diff --git a/chrome/browser/ui/search/ntp_user_data_logger.cc b/chrome/browser/ui/search/ntp_user_data_logger.cc
 --- a/chrome/browser/ui/search/ntp_user_data_logger.cc
 +++ b/chrome/browser/ui/search/ntp_user_data_logger.cc
@@ -233,14 +222,11 @@ diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/m
 diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/public/cpp/ukm_recorder.cc
 --- a/services/metrics/public/cpp/ukm_recorder.cc
 +++ b/services/metrics/public/cpp/ukm_recorder.cc
-@@ -14,7 +14,7 @@
+@@ -116,4 +116,5 @@ ukm::SourceId UkmRecorder::GetSourceIdFromScopeImpl(const GURL& scope_url,
+   return source_id;
+ }
 
- namespace ukm {
- 
-BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_DISABLED_BY_DEFAULT); // disabled in Bromite
- 
- BASE_FEATURE(kUkmReduceAddEntryIPC,
-              "UkmReduceAddEntryIPC",
+SET_CROMITE_FEATURE_DISABLED(kUkmFeature);
+ }  // namespace ukm
 --
 2.25.1
@@ -9,26 +9,14 @@ SitePerProcess: always consider enterprise policies applicable.
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                      | 3 ---
- chrome/browser/chrome_content_browser_client.cc    | 4 ++--
- chrome/common/chrome_features.cc                   | 8 ++------
- components/site_isolation/site_isolation_policy.cc | 3 +++
- content/public/common/content_features.cc          | 4 ++--
- 5 files changed, 9 insertions(+), 13 deletions(-)
+ chrome/browser/chrome_content_browser_client.cc               | 4 ++--
+ components/site_isolation/site_isolation_policy.cc            | 3 +++
+ .../Enable-StrictOriginIsolation-and-SitePerProcess.inc       | 1 +
+ .../Enable-StrictOriginIsolation-and-SitePerProcess.inc       | 1 +
+ 4 files changed, 7 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc

-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
-@@ -5102,9 +5102,6 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(
-          site_isolation::features::kSiteIsolationForPasswordSites)},
-    {"enable-site-per-process", flag_descriptions::kStrictSiteIsolationName,
-     flag_descriptions::kStrictSiteIsolationDescription, kOsAndroid,
-     SINGLE_VALUE_TYPE(switches::kSitePerProcess)},
- #endif
-     {"enable-isolated-web-apps", flag_descriptions::kEnableIsolatedWebAppsName,
-      flag_descriptions::kEnableIsolatedWebAppsDescription, kOsDesktop,
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -50,24 +38,6 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
   registry->RegisterListPref(
       site_isolation::prefs::kUserTriggeredIsolatedOrigins);
   registry->RegisterDictionaryPref(
-diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
-+++ b/chrome/common/chrome_features.cc
-@@ -1177,12 +1177,8 @@ const base::FeatureParam<base::TimeDelta> kSCTLogMaxIngestionRandomDelay{
- // TODO(alexmos): Move this and the other site isolation features below to
- // browser_features, as they are only used on the browser side.
- BASE_FEATURE(kSitePerProcess,
-             "SitePerProcess",
-#if BUILDFLAG(IS_ANDROID)
-             base::FEATURE_DISABLED_BY_DEFAULT
-#else
-             base::FEATURE_ENABLED_BY_DEFAULT
-#endif
-+             "SitePerProcess",                  // enabled by default
-+             base::FEATURE_ENABLED_BY_DEFAULT   // in Bromite
- );
- 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
 diff --git a/components/site_isolation/site_isolation_policy.cc b/components/site_isolation/site_isolation_policy.cc
 --- a/components/site_isolation/site_isolation_policy.cc
 +++ b/components/site_isolation/site_isolation_policy.cc
@@ -95,19 +65,17 @@ diff --git a/components/site_isolation/site_isolation_policy.cc b/components/sit
   if (!g_disallow_memory_threshold_caching_for_testing) {
     return CachedDisableSiteIsolation(site_isolation_mode);
   }
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -1008,8 +1008,8 @@ BASE_FEATURE(kSpareRendererForSitePerProcess,
- // Controls whether site isolation should use origins instead of scheme and
- // eTLD+1.
- BASE_FEATURE(kStrictOriginIsolation,
-             "StrictOriginIsolation",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "StrictOriginIsolation",              // must be enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);    // in Bromite
- 
- // Disallows window.{alert, prompt, confirm} if triggered inside a subframe that
- // is not same origin with the main frame.
+diff --git a/cromite_flags/chrome/common/chrome_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc b/cromite_flags/chrome/common/chrome_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/common/chrome_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_ENABLED(kSitePerProcess);
+diff --git a/cromite_flags/content/public/common/content_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc b/cromite_flags/content/public/common/content_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Enable-StrictOriginIsolation-and-SitePerProcess.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_ENABLED(kStrictOriginIsolation);
 --
 2.25.1
@@ -6,9 +6,10 @@ Unexpire #darken-websites-checkbox-in-themes-setting

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/flag-metadata.json                   | 6 +++---
- components/content_settings/core/common/features.cc | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ chrome/browser/flag-metadata.json                           | 6 +++---
+ .../Enable-darken-websites-checkbox-in-themes.inc           | 5 +++++
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+ create mode 100644 cromite_flags/components/content_settings/core/common/features_cc/Enable-darken-websites-checkbox-in-themes.inc

 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
@@ -26,19 +27,15 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
   },
   {
     "name": "data-retention-policies-disable-sync-types-needed",
-diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc
--- a/components/content_settings/core/common/features.cc
-+++ b/components/content_settings/core/common/features.cc
-@@ -19,8 +19,8 @@ BASE_FEATURE(kImprovedCookieControls,
- // Enables auto dark feature in theme settings.
- #if BUILDFLAG(IS_ANDROID)
- BASE_FEATURE(kDarkenWebsitesCheckboxInThemesSetting,
-             "DarkenWebsitesCheckboxInThemesSetting",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "DarkenWebsitesCheckboxInThemesSetting",     // must be enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);           // in Bromite
- constexpr base::FeatureParam<bool> kDarkenWebsitesCheckboxOptOut{
-     &kDarkenWebsitesCheckboxInThemesSetting, "opt_out", true};
- #endif  // BUILDFLAG(IS_ANDROID)
+diff --git a/cromite_flags/components/content_settings/core/common/features_cc/Enable-darken-websites-checkbox-in-themes.inc b/cromite_flags/components/content_settings/core/common/features_cc/Enable-darken-websites-checkbox-in-themes.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/components/content_settings/core/common/features_cc/Enable-darken-websites-checkbox-in-themes.inc
+@@ -0,0 +1,5 @@
+#if BUILDFLAG(IS_ANDROID)
+
+SET_CROMITE_FEATURE_ENABLED(kDarkenWebsitesCheckboxInThemesSetting);
+
+#endif  // BUILDFLAG(IS_ANDROID)
 --
 2.25.1
@@ -47,7 +47,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
     WebContents* web_contents) {
 -  return AwContents::FromWebContents(web_contents);
 +  return AwContents::FromWebContents(web_contents,
-+                                /*enable_secondary_autofill_manager*/ false);
+            /*enable_secondary_autofill_manager*/ false);
 }
 
 // static
@@ -58,7 +58,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
       "//chrome/browser/ui/android/hats:message_ui_delegate_java",
       "//chrome/browser/ui/android/layouts:java",
       "//chrome/browser/ui/android/layouts/glue:java",
-+    "//components/android_autofill/browser:java",
+      "//components/android_autofill/browser:java",
       "//chrome/browser/ui/android/logo:java",
       "//chrome/browser/ui/android/management:java",
       "//chrome/browser/ui/android/multiwindow:java",
@@ -4,22 +4,15 @@ Subject: Enable prefetch-privacy-changes by default

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- third_party/blink/common/features.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ .../features_cc/Enable-prefetch-privacy-changes-by-default.inc   | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Enable-prefetch-privacy-changes-by-default.inc

-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -1350,8 +1350,8 @@ BASE_FEATURE(kPrefetchFontLookupTables,
- // Prefetch request properties are updated to be privacy-preserving. See
- // crbug.com/988956.
- BASE_FEATURE(kPrefetchPrivacyChanges,
-             "PrefetchPrivacyChanges",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "PrefetchPrivacyChanges",            // must be enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);   // in Bromite
- 
- BASE_FEATURE(kPreloadingHeuristicsMLModel,
-              "PreloadingHeuristicsMLModel",
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Enable-prefetch-privacy-changes-by-default.inc b/cromite_flags/third_party/blink/common/features_cc/Enable-prefetch-privacy-changes-by-default.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_cc/Enable-prefetch-privacy-changes-by-default.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_ENABLED(kPrefetchPrivacyChanges);
 --
 2.25.1
@@ -6,9 +6,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 chrome/browser/chrome_content_browser_client.cc  |  2 +-
 content/common/user_agent.cc                     | 13 +++++--------
- third_party/blink/common/features.cc             |  4 ++--
 .../platform/runtime_enabled_features.json5      | 16 ++++++++--------
- 4 files changed, 16 insertions(+), 19 deletions(-)
+ 3 files changed, 14 insertions(+), 17 deletions(-)

 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
@@ -52,20 +51,6 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
   // Send information about the device.
   bool semicolon_inserted = false;
   if (include_android_model == IncludeAndroidModel::Include) {
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -1501,8 +1501,8 @@ BASE_FEATURE(kReducedReferrerGranularity,
- const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{
-     &kReduceUserAgentMinorVersion, "build_version", "0"};
- 
-const base::FeatureParam<bool> kAllExceptLegacyWindowsPlatform = {
-    &kReduceUserAgentPlatformOsCpu, "all_except_legacy_windows_platform", true};
-+const base::FeatureParam<bool> kAllExceptLegacyWindowsPlatform = {                 // must be enabled
-+    &kReduceUserAgentPlatformOsCpu, "all_except_legacy_windows_platform", true};   // in Bromite
- const base::FeatureParam<bool> kLegacyWindowsPlatform = {
-     &kReduceUserAgentPlatformOsCpu, "legacy_windows_platform", true};
- 
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -30,10 +30,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBo
 
     /**
      * Constructor.
-@@ -98,6 +104,13 @@ public class TabBookmarker {
+@@ -96,6 +102,13 @@ public class TabBookmarker {
+             return;
+         }
 
-         // Defense in depth against the UI being erroneously enabled.
-         final BookmarkModel bookmarkModel = mBookmarkModelSupplier.get();
 +	    // remove blocklisted URL from most visited sites
 +	    if (mMostVisitedSites == null) {
 +            mMostVisitedSites =
@@ -41,8 +41,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBo
 +        }
 +        mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl());
 +
+         // Defense in depth against the UI being erroneously enabled.
+         final BookmarkModel bookmarkModel = mBookmarkModelSupplier.get();
         if (bookmarkModel == null || !bookmarkModel.isEditBookmarksEnabled()) {
-             assert false;
-             return;
 --
 2.25.1
@@ -7,24 +7,17 @@ See also: https://trac.webkit.org/changeset/209076/webkit
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- content/public/common/content_features.cc                 | 4 ++--
- third_party/blink/renderer/core/loader/document_loader.cc | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ .../Remove-window-name-on-cross-origin-navigation.inc          | 1 +
+ third_party/blink/renderer/core/loader/document_loader.cc      | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Remove-window-name-on-cross-origin-navigation.inc

-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -175,8 +175,8 @@ BASE_FEATURE(kCdmStorageDatabaseMigration,
- // Clear the window.name property for the top-level cross-site navigations that
- // swap BrowsingContextGroups(BrowsingInstances).
- BASE_FEATURE(kClearCrossSiteCrossBrowsingContextGroupWindowName,
-             "ClearCrossSiteCrossBrowsingContextGroupWindowName",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "ClearCrossSiteCrossBrowsingContextGroupWindowName", // enabled
-+             base::FEATURE_ENABLED_BY_DEFAULT);                   // by default
- 
- BASE_FEATURE(kCompositeBGColorAnimation,
-              "CompositeBGColorAnimation",
+diff --git a/cromite_flags/content/public/common/content_features_cc/Remove-window-name-on-cross-origin-navigation.inc b/cromite_flags/content/public/common/content_features_cc/Remove-window-name-on-cross-origin-navigation.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Remove-window-name-on-cross-origin-navigation.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_ENABLED(kClearCrossSiteCrossBrowsingContextGroupWindowName);
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -9,74 +9,17 @@ Disable search-ready omnibox by default

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                         |  5 +++++
- chrome/browser/flag-metadata.json                     |  5 +++++
- chrome/browser/flag_descriptions.cc                   |  5 +++++
- chrome/browser/flag_descriptions.h                    |  3 +++
- chrome/browser/flags/android/chrome_feature_list.cc   |  5 +++++
- chrome/browser/flags/android/chrome_feature_list.h    |  1 +
- .../chrome/browser/flags/ChromeFeatureList.java       |  1 +
- .../suggestions/DropdownItemViewInfoListBuilder.java  | 11 +++++++++--
- 8 files changed, 34 insertions(+), 2 deletions(-)
+ chrome/browser/flags/android/chrome_feature_list.cc |  1 +
+ .../chrome/browser/flags/ChromeFeatureList.java     |  1 +
+ .../DropdownItemViewInfoListBuilder.java            | 11 +++++++++--
+ .../restore-Search-Ready-Omnibox-flag.inc           | 13 +++++++++++++
+ .../restore-Search-Ready-Omnibox-flag.inc           |  3 +++
+ .../restore-Search-Ready-Omnibox-flag.inc           |  1 +
+ 6 files changed, 28 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc

-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
-@@ -9818,6 +9818,11 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kDesksTemplatesDescription, kOsCrOS,
-      FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)},
- #endif
-+#if BUILDFLAG(IS_ANDROID)
-+    {"enable-search-ready-omnibox", flag_descriptions::kSearchReadyOmniboxName,
-+     flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
-+     FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
-+#endif
- 
-     {"large-favicon-from-google",
-      flag_descriptions::kLargeFaviconFromGoogleName,
-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
-@@ -3334,6 +3334,11 @@
-     // Added feature, for testing. expiry deep in future.
-     "expiry_milestone": 116
-   },
-+  {
-+    "name": "enable-search-ready-omnibox",
-+    "owners": [ "mdjones" ],
-+    "expiry_milestone": -1
-+  },
-   {
-     "name": "enable-parallel-downloading",
-     "owners": [ "qinmin", "xingliu", "dtrainor" ],
-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
-@@ -4420,6 +4420,11 @@ const char kSendTabToSelfV2Description[] =
-     "Enables new received tab "
-     "UI shown next to the profile icon instead of using system notifications.";
- 
-+const char kSearchReadyOmniboxName[] = "Search Ready Omnibox";
-+const char kSearchReadyOmniboxDescription[] =
-+    "Clears the omnibox and adds a suggestion item to share, copy, or edit the "
-+    "URL.";
-+
- const char kSetMarketUrlForTestingName[] = "Set market URL for testing";
- const char kSetMarketUrlForTestingDescription[] =
-     "When enabled, sets the market URL for use in testing the update menu "
-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
-@@ -2598,6 +2598,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[];
- extern const char kSendTabToSelfV2Name[];
- extern const char kSendTabToSelfV2Description[];
- 
-+extern const char kSearchReadyOmniboxName[];
-+extern const char kSearchReadyOmniboxDescription[];
-+
- extern const char kSetMarketUrlForTestingName[];
- extern const char kSetMarketUrlForTestingDescription[];
- 
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -88,28 +31,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
     &kRelatedSearches,
     &kReportParentalControlSitesChild,
     &kRequestDesktopSiteDefaults,
-@@ -468,6 +469,10 @@ BASE_FEATURE(kAvoidSelectedTabFocusOnLayoutDoneShowing,
-              "AvoidSelectedTabFocusOnLayoutDoneShowing",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
-+BASE_FEATURE(kSearchReadyOmniboxFeature,
-+             "SearchReadyOmnibox",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- BASE_FEATURE(kFocusOmniboxInIncognitoTabIntents,
-              "FocusOmniboxInIncognitoTabIntents",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
-+++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -170,6 +170,7 @@ BASE_DECLARE_FEATURE(kRequestDesktopSiteDefaultsDowngrade);
- BASE_DECLARE_FEATURE(kRequestDesktopSiteDefaultsLogging);
- BASE_DECLARE_FEATURE(kRestoreTabsOnFRE);
- BASE_DECLARE_FEATURE(kSearchEnginesPromoV3);
-+BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature);
- BASE_DECLARE_FEATURE(kSharingHubLinkToggle);
- BASE_DECLARE_FEATURE(kShowScrollableMVTOnNTPAndroid);
- BASE_DECLARE_FEATURE(kFeedPositionAndroid);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -163,5 +84,37 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
         for (int index = 0; index < mPriorityOrderedSuggestionProcessors.size(); index++) {
             mPriorityOrderedSuggestionProcessors.get(index).onNativeInitialized();
         }
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/restore-Search-Ready-Omnibox-flag.inc
+@@ -0,0 +1,13 @@
+#if BUILDFLAG(IS_ANDROID)
+
+#ifdef FLAG_SECTION
+
+    {"enable-search-ready-omnibox",
+     "Search Ready Omnibox",
+     "Clears the omnibox and adds a suggestion item to share, copy, or edit the "
+     "URL.", kOsAndroid,
+     FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
+
+#endif
+
+#endif
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/restore-Search-Ready-Omnibox-flag.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kSearchReadyOmniboxFeature,
+               "SearchReadyOmnibox",
+               base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/restore-Search-Ready-Omnibox-flag.inc
+@@ -0,0 +1 @@
+BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature);
 --
 2.25.1
@@ -15,17 +15,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../NativePageNavigationDelegateImpl.java     |  4 +-
 .../chrome/browser/ntp/NewTabPageLayout.java  | 30 ++++++++-
 .../SuggestionsNavigationDelegate.java        | 17 +++++
- chrome/browser/about_flags.cc                 |  3 +
- chrome/browser/flag_descriptions.cc           |  3 +
- chrome/browser/flag_descriptions.h            |  3 +
- .../flags/android/chrome_feature_list.cc      |  5 ++
- .../flags/android/chrome_feature_list.h       |  1 +
+ .../flags/android/chrome_feature_list.cc      |  1 +
 .../browser/flags/ChromeFeatureList.java      |  1 +
- .../signin/public/base/signin_switches.cc     |  2 +-
- .../variations/fieldtrial_testing_config.json | 18 +++++
- 17 files changed, 195 insertions(+), 5 deletions(-)
+ .../signin/public/base/signin_switches.cc     |  3 +
+ .../Restore-Simplified-NTP-launch.inc         | 12 ++++
+ .../Restore-Simplified-NTP-launch.inc         |  3 +
+ .../Restore-Simplified-NTP-launch.inc         |  1 +
+ 15 files changed, 181 insertions(+), 4 deletions(-)
 create mode 100644 chrome/android/java/res/layout/ntp_shortcuts.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/feedback/SimplifiedNtpFeedbackSource.java
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Restore-Simplified-NTP-launch.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-Simplified-NTP-launch.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-Simplified-NTP-launch.inc

 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
@@ -315,45 +316,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug
     /**
      * Opens the suggestions page without recording metrics.
      *
-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
-@@ -5567,6 +5567,9 @@ const FeatureEntry kFeatureEntries[] = {
-      SINGLE_VALUE_TYPE_AND_VALUE(
-          switches::kForceShowUpdateMenuItemCustomSummary,
-          "Custom Summary")},
-+    {"simplified-ntp", flag_descriptions::kSimplifiedNtpName,
-+     flag_descriptions::kSimplifiedNtpDescription, kOsAndroid,
-+     FEATURE_VALUE_TYPE(chrome::android::kSimplifiedNTP)},
-     {"force-show-update-menu-badge", flag_descriptions::kUpdateMenuBadgeName,
-      flag_descriptions::kUpdateMenuBadgeDescription, kOsAndroid,
-      SINGLE_VALUE_TYPE(switches::kForceShowUpdateMenuBadge)},
-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
-@@ -4502,6 +4502,9 @@ const char kStartSurfaceWithAccessibilityName[] =
- const char kStartSurfaceWithAccessibilityDescription[] =
-     "Enable Start Surface with Accessibility.";
- 
-+const char kSimplifiedNtpName[] = "Simplified NTP";
-+const char kSimplifiedNtpDescription[] = "Show a simplified New Tab Page.";
-+
- const char kStrictSiteIsolationName[] = "Strict site isolation";
- const char kStrictSiteIsolationDescription[] =
-     "Security mode that enables site isolation for all sites (SitePerProcess). "
-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
-@@ -2625,6 +2625,9 @@ extern const char kSmartZoomDescription[];
- extern const char kSmartSuggestionForLargeDownloadsName[];
- extern const char kSmartSuggestionForLargeDownloadsDescription[];
- 
-+extern const char kSimplifiedNtpName[];
-+extern const char kSimplifiedNtpDescription[];
-+
- extern const char kStartSurfaceAndroidName[];
- extern const char kStartSurfaceAndroidDescription[];
- 
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -365,28 +327,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
     &kInstanceSwitcher,
     &kInstantStart,
     &kLensCameraAssistedSearch,
-@@ -859,6 +860,10 @@ BASE_FEATURE(kInstanceSwitcher,
-              "InstanceSwitcher",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
-+BASE_FEATURE(kSimplifiedNTP,
-+             "SimplifiedNTP",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
- BASE_FEATURE(kPageAnnotationsService,
-              "PageAnnotationsService",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
-+++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -141,6 +141,7 @@ BASE_DECLARE_FEATURE(kOmniboxModernizeVisualUpdate);
- BASE_DECLARE_FEATURE(kOmniboxWarmRecycledViewPool);
- BASE_DECLARE_FEATURE(kOptimizeGeolocationHeaderGeneration);
- BASE_DECLARE_FEATURE(kPageAnnotationsService);
-+BASE_DECLARE_FEATURE(kSimplifiedNTP);
- BASE_DECLARE_FEATURE(kPreconnectOnTabCreation);
- BASE_DECLARE_FEATURE(kBookmarksImprovedSaveFlow);
- BASE_DECLARE_FEATURE(kBookmarksRefresh);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -401,42 +341,44 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/components/signin/public/base/signin_switches.cc b/components/signin/public/base/signin_switches.cc
 --- a/components/signin/public/base/signin_switches.cc
 +++ b/components/signin/public/base/signin_switches.cc
-@@ -14,7 +14,7 @@ namespace switches {
- // Feature to add a signed-out avatar on the NTP.
- BASE_FEATURE(kIdentityStatusConsistency,
-              "IdentityStatusConsistency",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
+@@ -84,4 +84,7 @@ BASE_FEATURE(kSearchEngineChoiceFre,
 
- // Clears the token service before using it. This allows simulating the
-diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
-+++ b/testing/variations/fieldtrial_testing_config.json
-@@ -7994,6 +7994,24 @@
-             ]
-         }
-     ],
-+    "SimplifiedNTP": [
-+        {
-+            "platforms": [
-+                "android"
-+            ],
-+            "experiments": [
-+                {
-+                    "name": "Enabled_NoScrollToLoad",
-+                    "enable_features": [
-+                        "SimplifiedNTP"
-+                    ],
-+                    "disable_features": [
-+                        "ContentSuggestionsScrollToLoad"
-+                    ]
-+                }
-+            ]
-+        }
-+    ],
-     "HelpAppLauncherSearch": [
-         {
-             "platforms": [
+ BASE_FEATURE(kUnoDesktop, "UnoDesktop", base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+#if BUILDFLAG(IS_ANDROID)
+SET_CROMITE_FEATURE_DISABLED(kIdentityStatusConsistency);
+#endif
+ }  // namespace switches
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Restore-Simplified-NTP-launch.inc b/cromite_flags/chrome/browser/about_flags_cc/Restore-Simplified-NTP-launch.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Restore-Simplified-NTP-launch.inc
+@@ -0,0 +1,12 @@
+#if BUILDFLAG(IS_ANDROID)
+
+#ifdef FLAG_SECTION
+
+    {"simplified-ntp",
+     "Simplified NTP",
+     "Show a simplified New Tab Page.", kOsAndroid,
+     FEATURE_VALUE_TYPE(chrome::android::kSimplifiedNTP)},
+
+#endif
+
+#endif
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-Simplified-NTP-launch.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-Simplified-NTP-launch.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-Simplified-NTP-launch.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kSimplifiedNTP,
+                "SimplifiedNTP",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-Simplified-NTP-launch.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-Simplified-NTP-launch.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-Simplified-NTP-launch.inc
+@@ -0,0 +1 @@
+BASE_DECLARE_FEATURE(kSimplifiedNTP);
 --
 2.25.1
@@ -7,26 +7,11 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
 Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc       | 4 ++++
- chrome/browser/flag-metadata.json   | 4 ++++
- chrome/browser/flag_descriptions.cc | 4 ++++
- chrome/browser/flag_descriptions.h  | 3 +++
- 4 files changed, 15 insertions(+)
+ chrome/browser/flag-metadata.json                    |  4 ++++
+ ...t-flags-remove-disable-pull-to-refresh-effect.inc | 12 ++++++++++++
+ 2 files changed, 16 insertions(+)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-disable-pull-to-refresh-effect.inc

-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
-@@ -4943,6 +4943,10 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsWin | kOsLinux | kOsAndroid | kOsCrOS,
-      FEATURE_VALUE_TYPE(features::kVulkan)},
- #if BUILDFLAG(IS_ANDROID)
-+    {switches::kDisablePullToRefreshEffect,
-+     flag_descriptions::kDisablePullToRefreshEffectName,
-+     flag_descriptions::kDisablePullToRefreshEffectDescription, kOsAndroid,
-+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)},
-     {"translate-message-ui", flag_descriptions::kTranslateMessageUIName,
-      flag_descriptions::kTranslateMessageUIDescription, kOsAndroid,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(translate::kTranslateMessageUI,
 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
@@ -41,32 +26,22 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
   {
     "name": "disable-quick-answers-v2-translation",
     "owners": [ "croissant-eng" ],
-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
-@@ -4297,6 +4297,10 @@ const char kReadLaterDescription[] =
-     "Allow users to save tabs for later. Enables a new button and menu for "
-     "accessing tabs saved for later.";
- 
-+const char kDisablePullToRefreshEffectName[] = "The pull-to-refresh effect";
-+const char kDisablePullToRefreshEffectDescription[] =
-+    "Page reloads triggered by vertically overscrolling content.";
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-disable-pull-to-refresh-effect.inc b/cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-disable-pull-to-refresh-effect.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-disable-pull-to-refresh-effect.inc
+@@ -0,0 +1,12 @@
+#if BUILDFLAG(IS_ANDROID)
 +
- const char kReaderModeHeuristicsName[] = "Reader Mode triggering";
- const char kReaderModeHeuristicsDescription[] =
-     "Determines what pages the Reader Mode infobar is shown on.";
-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
-@@ -2538,6 +2538,9 @@ extern const char kQueryTilesSwapTrendingDescription[];
- extern const char kReadAloudName[];
- extern const char kReadAloudDescription[];
- 
-+extern const char kDisablePullToRefreshEffectName[];
-+extern const char kDisablePullToRefreshEffectDescription[];
+#ifdef FLAG_SECTION
 +
- extern const char kReaderModeHeuristicsName[];
- extern const char kReaderModeHeuristicsDescription[];
- extern const char kReaderModeHeuristicsMarkup[];
+    {switches::kDisablePullToRefreshEffect,
+     "The pull-to-refresh effect",
+     "Page reloads triggered by vertically overscrolling content.", kOsAndroid,
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)},
+
+#endif
+
+#endif
 --
 2.25.1
@@ -17,7 +17,7 @@ This reverts commit 11f6a3e29bee9a6590a4fd56b28e8048200c18d0.
 Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- content/public/common/content_features.cc     |  2 +-
+ ...val-of-execution-context-address-space.inc |  2 ++
 .../execution_context/execution_context.cc    |  9 +++++
 .../execution_context/execution_context.h     |  4 +++
 .../core/exported/web_shared_worker_impl.cc   |  1 +
@@ -53,20 +53,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../audio_worklet_global_scope_test.cc        |  1 +
 .../webaudio/audio_worklet_thread_test.cc     |  1 +
 .../worklet/worklet_thread_test_common.cc     |  2 +-
- 36 files changed, 189 insertions(+), 25 deletions(-)
+ 36 files changed, 190 insertions(+), 24 deletions(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Revert-removal-of-execution-context-address-space.inc

-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -125,7 +125,7 @@ BASE_FEATURE(kBlockInsecurePrivateNetworkRequests,
- //  - kBlockInsecurePrivateNetworkRequests
- BASE_FEATURE(kBlockInsecurePrivateNetworkRequestsFromPrivate,
-              "BlockInsecurePrivateNetworkRequestsFromPrivate",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             base::FEATURE_ENABLED_BY_DEFAULT);
- 
- // Enables use of the PrivateNetworkAccessNonSecureContextsAllowed deprecation
- // trial. This is a necessary yet insufficient condition: documents that wish to
+diff --git a/cromite_flags/content/public/common/content_features_cc/Revert-removal-of-execution-context-address-space.inc b/cromite_flags/content/public/common/content_features_cc/Revert-removal-of-execution-context-address-space.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Revert-removal-of-execution-context-address-space.inc
+@@ -0,0 +1,2 @@
+SET_CROMITE_FEATURE_ENABLED(kBlockInsecurePrivateNetworkRequests);
+SET_CROMITE_FEATURE_ENABLED(kBlockInsecurePrivateNetworkRequestsFromPrivate);
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -15,10 +15,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../core/browser/autofill_download_manager.cc | 43 +++----------------
 .../core/browser/autofill_download_manager.h  |  2 -
 .../core/browser/browser_autofill_manager.h   |  4 +-
- .../autofill/core/common/autofill_features.cc |  4 +-
+ .../autofill/core/common/autofill_features.cc |  1 +
 .../autofill/core/common/autofill_prefs.cc    | 10 ++---
 .../password_generation_frame_helper.cc       |  4 --
- 8 files changed, 20 insertions(+), 60 deletions(-)
+ 8 files changed, 19 insertions(+), 58 deletions(-)

 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
@@ -163,17 +163,14 @@ diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/compo
 diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
 --- a/components/autofill/core/common/autofill_features.cc
 +++ b/components/autofill/core/common/autofill_features.cc
-@@ -797,8 +797,8 @@ BASE_FEATURE(kAutofillLogToTerminal,
- // "upload" resources.
- // i.e., https://other.autofill.server:port/tbproxy/af/
- BASE_FEATURE(kAutofillServerCommunication,
-             "AutofillServerCommunication",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "AutofillServerCommunication",       // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
+@@ -811,6 +811,7 @@ BASE_FEATURE(kAutofillUploadThrottling,
+              "AutofillUploadThrottling",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 
- // Controls attaching the autofill type predictions to their respective
- // element in the DOM.
+SET_CROMITE_FEATURE_DISABLED(kAutofillServerCommunication);
+ }  // namespace test
+ 
+ }  // namespace autofill::features
 diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
@@ -56,10 +56,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../logo_service_impl.cc                      |  16 +-
 components/url_matcher/url_util.cc            |  83 -----
 content/common/features.cc                    |   4 +-
- content/public/common/content_features.cc     |   6 +-
+ ...gled-chromium-no-special-hosts-domains.inc |   1 +
 net/base/url_util.cc                          |  21 --
 services/network/network_context.cc           |   2 +-
- 52 files changed, 60 insertions(+), 805 deletions(-)
+ 52 files changed, 58 insertions(+), 802 deletions(-)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc

 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
@@ -1643,22 +1644,12 @@ diff --git a/content/common/features.cc b/content/common/features.cc
 
 // If enabled, limits the number of FLEDGE auctions that can be run between page
 // load and unload -- any attempt to run more than this number of auctions will
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -380,9 +380,9 @@ BASE_FEATURE(kFedCmSelectiveDisclosure,
- 
- // Enables the IDP signin status API for use with FedCM, including avoiding
- // network requests when not signed in and mismatch handling.
-BASE_FEATURE(kFedCmIdpSigninStatusEnabled,
-             "FedCmIdpSigninStatusEnabled",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+BASE_FEATURE(kFedCmIdpSigninStatusEnabled,          // disabled
-+             "FedCmIdpSigninStatusEnabled",         // by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // on bromite
- 
- // Enables bypassing the well-known file enforcement.
- BASE_FEATURE(kFedCmWithoutWellKnownEnforcement,
+diff --git a/cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc b/cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kFedCmIdpSigninStatusEnabled);
 diff --git a/net/base/url_util.cc b/net/base/url_util.cc
 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc