Add device format filter in DisableIf() annotation

base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java

Index: base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
index 38eb16ada8347d3f83d324f6f1dfc95ce1563e73..f1ca168c0f53b4f25215e5d305c0d1cd359b6417 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
@@ -4,11 +4,13 @@
 
 package org.chromium.base.test.util;
 
+import android.content.Context;
 import android.os.Build;
 
 import junit.framework.TestCase;
 
 import org.chromium.base.Log;
+import org.chromium.base.util.base.DeviceFormFactor;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -22,6 +24,12 @@ public class DisableIfSkipCheck extends SkipCheck {
 
     private static final String TAG = "cr_base_test";
 
+    private final Context mTargetContext;
+
+    public DisableIfSkipCheck(Context targetContext) {
+        mTargetContext = targetContext;
+    }
+
     @Override
     public boolean shouldSkip(TestCase testCase) {
         Method method = getTestMethod(testCase);
@@ -66,5 +74,11 @@ public class DisableIfSkipCheck extends SkipCheck {
                 && Build.VERSION.SDK_INT < v.sdk_is_less_than();
     }
 
+    private boolean device(DisableIf.Build v) {
+        return v.device_format().isEmpty() || (v.device_format().equals("tablet")
+            && DeviceFormFactor.isTablet(mTargetContext)) || (v.device_format().equals("phone")

[Ted C, 2016/07/20 18:45:35]

indent 8

[shenghuazhang, 2016/07/21 22:38:28]

Done.

+            && !DeviceFormFactor.isTablet(mTargetContext));
+    }
+
 }