| Index: chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| index ada8bb894394e509c9dd31a499c92342e343de46..8da9aeeb72e76cfddc09e7bc03f93004c176aa39 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| @@ -232,6 +232,9 @@ public class FeatureUtilities {
|
| * @return True if tab model merging for Android N+ is enabled.
|
| */
|
| public static boolean isTabModelMergingEnabled() {
|
| + if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_TAB_MERGING_FOR_TESTING)) {
|
| + return false;
|
| + }
|
| return Build.VERSION.SDK_INT > Build.VERSION_CODES.M;
|
| }
|
|
|
|
|