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

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

 // 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.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;
 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;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestTouchUtils;
 
 import java.util.ArrayDeque;
 
 /**
  * Test suite for ContentView focus and its interaction with Tab switcher,
@@ skipping 38 matching lines @@
             return !mFocusChanges.isEmpty();
         }
     }
 
     /**
      * Verify ContentView loses/gains focus on swiping tab.
      *
      * @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
     public void testHideSelectionOnPhoneTabSwiping() throws Exception {
         // Setup
         ChromeTabUtils.newTabsFromMenu(getInstrumentation(), getActivity(), 2);
         String url = UrlUtils.getIsolatedTestFileUrl(
                 "chrome/test/data/android/content_view_focus/content_view_focus_long_text.html");
         loadUrl(url);
         View view = getActivity().getActivityTab().getContentViewCore().getContainerView();
@@ skipping 49 matching lines @@
     }
 
     /**
      * Verify ContentView loses/gains focus on overview mode.
      *
      * @throws Exception
      * @Feature({"TabContents"})
      */
     @MediumTest
     @Feature({"TabContents"})
-    @Restriction(RESTRICTION_TYPE_PHONE)
+    @ChromeRestriction(ChromeRestriction.RESTRICTION_TYPE_PHONE)
     public void testHideSelectionOnPhoneTabSwitcher() throws Exception {
         // Setup
         OverviewModeBehaviorWatcher showWatcher = new OverviewModeBehaviorWatcher(
                 getActivity().getLayoutManager(), true, false);
         OverviewModeBehaviorWatcher hideWatcher = new OverviewModeBehaviorWatcher(
                 getActivity().getLayoutManager(), false, true);
         View currentView = getActivity().getActivityTab().getContentViewCore().getContainerView();
         addFocusChangedListener(currentView);
 
         // Enter the tab switcher
@@ skipping 14 matching lines @@
 
         assertTrue("Content view didn't regain focus", blockForFocusChanged());
         assertFalse("Unexpected focus change", haveFocusChanges());
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 }