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

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
index 25fb441181fb564e6283a3789dce5c4d8b7c0e1f..cb2d89ab0e0435d9dc452bcf3eb9c56f940ee53d 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
@@ -10,6 +10,9 @@ import android.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+
 import junit.framework.TestCase;
 
 import org.chromium.base.test.BaseInstrumentationTestRunner;
@@ -230,6 +233,12 @@ public class ChromeInstrumentationTestRunner extends BaseInstrumentationTestRunn
                     && !DeviceFormFactor.isTablet(getTargetContext())) {
                 return true;
             }
+            if (TextUtils.equals(restriction, Restriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
+                    && (ConnectionResult.SUCCESS != GoogleApiAvailability.getInstance()
+                            .isGooglePlayServicesAvailable(getTargetContext()))) {

[jbudorick, 2016/01/13 14:43:50]

It's not clear to me from the docs
(https://developers.google.com/android/reference/com/google/android/gms/common...)
that this does what we want it to do.

Also, it sounds suspiciously like there's a network dependency somewhere in
there.

[Yaron, 2016/01/13 15:54:30]

Hmm, I didn't rule out the possibility that underneath it does network but in
general it's not. What this does is tries to bind to the play services app and
check the version number. The version number that's required is specified in
./third_party/android_tools/sdk/extras/google/google_play_services/libproject/google-play-services_lib/res/values/version.xml
We use it in other places to check whether we can connect to play services:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/android/jav...

+                return true;
+            }
+
             return false;
         }
     }