| 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 8caa3ef008865be343db8651d6fc13b1857c62c6..88a22fb612f902564a66497f26c8cfebff7f47a8 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
|
| @@ -234,6 +234,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;
|
| }
|
|
|
|
|