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

chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java
index ee23283825edab8ccdba7885e1cf40b3bc17723b..4b2146abec28f6d389fb71dbcc96f2453837d96b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java
@@ -4,8 +4,6 @@
 
 package org.chromium.chrome.browser;
 
-import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_PHONE;
-
 import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
@@ -13,13 +11,13 @@ import android.view.View.OnFocusChangeListener;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeEventFilter.ScrollDirection;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
+import org.chromium.chrome.test.util.ChromeRestriction;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.chrome.test.util.OverviewModeBehaviorWatcher;
 import org.chromium.content.browser.test.util.Criteria;
@@ -78,7 +76,7 @@ public class ContentViewFocusTest extends ChromeTabbedActivityTestBase {
      * @throws Exception
      * @MediumTest
      * @Feature({"TabContents"})
-     * @Restriction(RESTRICTION_TYPE_PHONE)
+     * @ChromeRestriction(RESTRICTION_TYPE_PHONE)

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

nit: ChromeRestriction.RESTRICTION_TYPE_PHONE

      * Bug: http://crbug.com/172473
      */
     @FlakyTest
@@ -148,7 +146,7 @@ public class ContentViewFocusTest extends ChromeTabbedActivityTestBase {
      */
     @MediumTest
     @Feature({"TabContents"})
-    @Restriction(RESTRICTION_TYPE_PHONE)
+    @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
     public void testHideSelectionOnPhoneTabSwitcher() throws Exception {
         // Setup
         OverviewModeBehaviorWatcher showWatcher = new OverviewModeBehaviorWatcher(