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..bb878cccb93db4e1e0f7335a6b86d76b1cfb98c3 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
@@ -36,6 +36,17 @@ public class DisableIfSkipCheck extends SkipCheck {
             }
         }
 
+        for (DisableIf.Device d : getAnnotations(method, DisableIf.Device.class)) {

[Yaron, 2016/07/22 15:43:05]

Do you need any modifications in base? Couldn't you move this to
ChromeDisableIfSkipCheck.shouldSkip?

Oh but then your annotation would be ChromeDisableIf.Device(..) :(

I wonder if there's a cleaner way of specifying the annotations but I don't know
annotation processing well enough to recommend it.

[shenghuazhang, 2016/07/22 20:37:32]

Yeah. I am not sure which is better, to keep the Device filter annotation under
base/ @DisableIf, or create it in chrome/ layer just as a new one.
@jbudorick What do you think about this?

[jbudorick, 2016/07/27 15:12:52]

This way works, and I think I'm ok with it for now.

I'd prefer that we handle DisableIf similarly to how we handle Restriction --
top-level annotation defined in base/ along with some basic values, then
chrome/-specific values in chrome/ -- but I haven't been able to come up with a
clean way to do so yet.

(I'm also no longer convinced that @DisableIf should be separate from
@Restriction; the distinction between the two is likely too nuanced for most
people to care, and it functionally shouldn't make a difference.)

+            for (String deviceType : d.type()) {
+                if (deviceTypeApplies(deviceType)) {
+                    Log.i(TAG, "Test " + testCase.getClass().getName() + "#"
+                            + testCase.getName() + " disabled because of "
+                            + d);
+                    return true;
+                }
+            }
+        }
+
         return false;
     }
 
@@ -66,5 +77,9 @@ public class DisableIfSkipCheck extends SkipCheck {
                 && Build.VERSION.SDK_INT < v.sdk_is_less_than();
     }
 
+    protected boolean deviceTypeApplies(String type) {
+        return false;
+    }
+
 }