Add a testing restriction for whether Google Play Services is up-to-date.

chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java
similarity index 54%
copy from base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java
copy to chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java
index 4b561a6f6fd966d39bff9b87ab269242c4e9947b..b6da4a8ad2a9f41c7b946241eac7370ac804d579 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.test.util;
+package org.chromium.chrome.test.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -17,21 +17,16 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Restriction {
+public @interface ChromeRestriction {

[jbudorick, 2016/01/25 15:21:37]

Why is this its own annotation instead of just being a bunch of static final
Strings that get processed within the existing @Restriction annotation by
ChromeRestrictionSkipCheck?

i.e. this:

  @Restriction({Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE,
                ChromeRestriction.RESTRICTION_TYPE_PHONE})
  public void testNoStackAnimation() throws Exception {
      ...

seems less clunky to me than this:

  @ChromeRestriction({ChromeRestriction.RESTRICTION_TYPE_PHONE})
  @Restriction({Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE})
  public void testNoStackAnimation() throws Exception {
      ...

[Yaron, 2016/01/25 21:39:55]

Hmm. I guess I got confused and thought the annotation took the enum and not
just any string. Much better, thanks.

+
     /** Specifies the test is only valid on phone form factors. */
-    public static final String RESTRICTION_TYPE_PHONE = "Phone";
+    String RESTRICTION_TYPE_PHONE = "Phone";
 
     /** Specifies the test is only valid on tablet form factors. */
-    public static final String RESTRICTION_TYPE_TABLET = "Tablet";
-
-    /** Specifies the test is only valid on low end devices that have less memory. */
-    public static final String RESTRICTION_TYPE_LOW_END_DEVICE = "Low_End_Device";
-
-    /** Specifies the test is only valid on non-low end devices. */
-    public static final String RESTRICTION_TYPE_NON_LOW_END_DEVICE = "Non_Low_End_Device";
+    String RESTRICTION_TYPE_TABLET = "Tablet";
 
-    /** Specifies the test is only valid on a device that can reach the internet. */
-    public static final String RESTRICTION_TYPE_INTERNET = "Internet";
+    /** Specifies the test is only valid on a device that has up to date play services. */
+    String RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES = "Google_Play_Services";
 
     /**
      * @return A list of restrictions.