Merge branch '3674-master-155' into 'master'

             // Defer creation of this helper so it triggers after TabGroupModelFilter observers.

             mUndoRefocusHelper =

                     new UndoRefocusHelper(

@@ -3152,7 +3161,7 @@ public class ChromeTabbedActivity extends ChromeActivity {

@@ -3137,7 +3146,7 @@ public class ChromeTabbedActivity extends ChromeActivity {

         }

         // We determine the model as soon as possible so every systems get initialized coherently.

diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc

--- a/components/omnibox/browser/base_search_provider.cc

+++ b/components/omnibox/browser/base_search_provider.cc

@@ -431,7 +431,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(

@@ -432,7 +432,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(

   // Don't make a suggest request if in incognito mode; unless for the Lens

   // searchboxes.

 base/android/feature_map.cc                   |   5 +

 .../base/cached_flags/ValuesReturned.java     |   2 +-

 base/feature_list.cc                          |  76 ++++++++

 base/feature_list.h                           |  72 +++++++-

 base/feature_list.h                           |  80 +++++++-

 build/android/gyp/java_cpp_features.py        |  17 ++

 chrome/android/java/res/values/values.xml     |   3 +

 .../java/res/xml/privacy_preferences.xml      |   4 +

 third_party/blink/public/common/features.h    |   1 +

 ui/base/ui_base_features.cc                   |   1 +

 ui/base/ui_base_features.h                    |   1 +

 94 files changed, 826 insertions(+), 31 deletions(-)

 94 files changed, 834 insertions(+), 31 deletions(-)

 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java

 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl

 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp

   // Some characters are not allowed to appear in feature names or the

   // associated field trial names, as they are used as special characters for

   // command-line serialization. This function checks that the strings are ASCII

@@ -754,4 +764,62 @@ class BASE_EXPORT FeatureList {

@@ -754,4 +764,70 @@ class BASE_EXPORT FeatureList {

 }  // namespace base

+      g_feature_default_state_overrider_ ##feature {namespace_value::feature, base::FEATURE_DISABLED_BY_DEFAULT}; \

+  _Pragma("clang diagnostic pop")                               \

+  static_assert(true, "") /* for a semicolon requirement */

+

+#define BASE_FEATURE_DISABLED(feature, name, default_state) \

+  BASE_FEATURE(feature, name, default_state); \

+  static_assert(default_state == base::FEATURE_DISABLED_BY_DEFAULT, "Check default state")

+

+#define BASE_FEATURE_ENABLED(feature, name, default_state) \

+  BASE_FEATURE(feature, name, default_state); \

+  static_assert(default_state == base::FEATURE_ENABLED_BY_DEFAULT, "Check default state")

+

 #endif  // BASE_FEATURE_LIST_H_

diff --git a/build/android/gyp/java_cpp_features.py b/build/android/gyp/java_cpp_features.py

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

@@ -380,6 +380,10 @@ using flags_ui::kOsLinux;

@@ -381,6 +381,10 @@ using flags_ui::kOsLinux;

 using flags_ui::kOsMac;

 using flags_ui::kOsWin;

 namespace about_flags {

 namespace {

@@ -4902,6 +4906,10 @@ const FeatureEntry::FeatureVariation

@@ -4903,6 +4907,10 @@ const FeatureEntry::FeatureVariation

 constexpr char kWebiumFlag[] = "webium";

 #endif  // !BUILDFLAG(IS_ANDROID)

 // RECORDING USER METRICS FOR FLAGS:

 // -----------------------------------------------------------------------------

 // The first line of the entry is the internal name.

@@ -4928,6 +4936,9 @@ constexpr char kWebiumFlag[] = "webium";

@@ -4929,6 +4937,9 @@ constexpr char kWebiumFlag[] = "webium";

 const FeatureEntry kFeatureEntries[] = {

 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and

 // //tools/flags/generate_unexpire_flags.py.

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

@@ -331,6 +331,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(

@@ -337,6 +337,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(

     "snippet_as_subtitle",

     /*default_value=*/false);

 /**

  * This is the main activity for ChromeMobile when not running in document mode. All the tabs are

  * accessible via a chrome specific tab switching UI.

@@ -3707,6 +3709,8 @@ public class ChromeTabbedActivity extends ChromeActivity {

@@ -3692,6 +3694,8 @@ public class ChromeTabbedActivity extends ChromeActivity {

                     .closeTabs(

                             TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);

             RecordUserAction.record("MobileTabClosed");

 #include "base/feature_list.h"

 #include "base/format_macros.h"

 #include "base/functional/bind.h"

@@ -567,6 +568,15 @@ AutocompleteController::AutocompleteController(

@@ -569,6 +570,15 @@ AutocompleteController::AutocompleteController(

           provider_client_->GetOmniboxTriggeredFeatureService()),

       steady_state_omnibox_position_(

           metrics::OmniboxEventProto::UNKNOWN_POSITION) {

 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;

 import org.chromium.components.browser_ui.edge_to_edge.SystemBarColorHelper;

 import org.chromium.components.browser_ui.edge_to_edge.TabbedSystemBarColorHelper;

@@ -3739,6 +3745,8 @@ public class ChromeTabbedActivity extends ChromeActivity {

@@ -3724,6 +3730,8 @@ public class ChromeTabbedActivity extends ChromeActivity {

                     getTabModelSelectorSupplier().get(),

                     closeAllTabsRunnable);

             RecordUserAction.record("MobileMenuCloseAllTabs");

         } else if (id == R.id.close_all_incognito_tabs_menu_id) {

             boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);

@@ -3863,6 +3871,41 @@ public class ChromeTabbedActivity extends ChromeActivity {

@@ -3848,6 +3856,41 @@ public class ChromeTabbedActivity extends ChromeActivity {

         getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);

     }