1 files changed, 9 insertions, 2 deletions
diff --git a/base/test/android/javatests/src/org/chromium/base/test/transit/ViewElementInState.java b/base/test/android/javatests/src/org/chromium/base/test/transit/ViewElementInState.java
index d1fe0fa8f9..5aa969303a 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/transit/ViewElementInState.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/transit/ViewElementInState.java
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
 import org.hamcrest.Matcher;
 
 import org.chromium.base.test.transit.ViewConditions.DisplayedCondition;
+import org.chromium.base.test.transit.ViewConditions.ExistsCondition;
 import org.chromium.base.test.transit.ViewConditions.GatedDisplayedCondition;
 import org.chromium.base.test.transit.ViewConditions.NotDisplayedAnymoreCondition;
 import org.chromium.base.test.transit.ViewElement.Scope;
@@ -39,12 +40,18 @@ class ViewElementInState implements ElementInState {
         mGate = gate;
 
         Matcher<View> viewMatcher = mViewElement.getViewMatcher();
+        ExistsCondition.Options conditionOptions =
+                ExistsCondition.newOptions()
+                        .withExpectEnabled(mViewElement.getOptions().mExpectEnabled)
+                        .build();
         if (mGate != null) {
             GatedDisplayedCondition gatedDisplayedCondition =
-                    new GatedDisplayedCondition(mViewElement.getViewMatcher(), mGate);
+                    new GatedDisplayedCondition(
+                            mViewElement.getViewMatcher(), mGate, conditionOptions);
             mEnterCondition = gatedDisplayedCondition;
         } else {
-            DisplayedCondition displayedCondition = new DisplayedCondition(viewMatcher);
+            DisplayedCondition displayedCondition =
+                    new DisplayedCondition(viewMatcher, conditionOptions);
             mEnterCondition = displayedCondition;
         }