Convert chrome compositor test's InstrumentationTestCases

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

 // Copyright 2014 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.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ skipping 39 matching lines @@
 
     @Override
     protected void addTestHooks(BaseTestResult result) {
         super.addTestHooks(result);
         result.addSkipCheck(new ChromeRestrictionSkipCheck(getTargetContext()));
         result.addSkipCheck(new ChromeDisableIfSkipCheck(getTargetContext()));
 
         result.addPreTestHook(Policies.getRegistrationHook());
     }
 
-    private class ChromeRestrictionSkipCheck extends RestrictionSkipCheck {
+    static class ChromeRestrictionSkipCheck extends RestrictionSkipCheck {
         private VrDaydreamApi mDaydreamApi;
         private boolean mAttemptedToGetApi;
+        private Context mTargetContext;
 
         public ChromeRestrictionSkipCheck(Context targetContext) {
             super(targetContext);
+            mTargetContext = targetContext;

[jbudorick, 2017/03/22 15:58:07]

This should not store the target context. RestrictionSkipCheck already does so.

[the real yoland, 2017/03/22 17:43:33]

Done

         }
 
         @SuppressWarnings("unchecked")
         private VrDaydreamApi getDaydreamApi() {
             if (!mAttemptedToGetApi) {
                 mAttemptedToGetApi = true;
                 try {
                     Class<? extends VrClassesWrapper> vrClassesBuilderClass =
                             (Class<? extends VrClassesWrapper>) Class.forName(
                                     "org.chromium.chrome.browser.vr_shell.VrClassesWrapperImpl");
                     Constructor<?> vrClassesBuilderConstructor =
                             vrClassesBuilderClass.getConstructor();
                     VrClassesWrapper vrClassesBuilder =
                             (VrClassesWrapper) vrClassesBuilderConstructor.newInstance();
-                    mDaydreamApi = vrClassesBuilder.createVrDaydreamApi(getTargetContext());
+                    mDaydreamApi = vrClassesBuilder.createVrDaydreamApi(mTargetContext);

[jbudorick, 2017/03/22 15:58:07]

Perhaps we should expose that context via a method in RestrictionSkipCheck,
though.

[the real yoland, 2017/03/22 17:43:33]

Done

                 } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
                         | IllegalArgumentException | InvocationTargetException
                         | NoSuchMethodException e) {
                     return null;
                 }
             }
             return mDaydreamApi;
         }
 
         private boolean isDaydreamReady() {
@@ skipping 23 matching lines @@
         }
 
         private boolean supportsWebVr() {
             // WebVR support is tied to VR Services support, which is only on K+
             return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
         }
 
         @Override
         protected boolean restrictionApplies(String restriction) {
             if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_PHONE)
-                    && DeviceFormFactor.isTablet(getTargetContext())) {
+                    && DeviceFormFactor.isTablet(mTargetContext)) {
                 return true;
             }
             if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_TABLET)
-                    && !DeviceFormFactor.isTablet(getTargetContext())) {
+                    && !DeviceFormFactor.isTablet(mTargetContext)) {
+                return true;
+            }
+            if (TextUtils.equals(
+                        restriction, ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
+                    && (ConnectionResult.SUCCESS
+                               != GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+                                          mTargetContext))) {
                 return true;
             }
             if (TextUtils.equals(restriction,
-                    ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
-                    && (ConnectionResult.SUCCESS != GoogleApiAvailability.getInstance()
-                    .isGooglePlayServicesAvailable(getTargetContext()))) {
-                return true;
-            }
-            if (TextUtils.equals(restriction,
                     ChromeRestriction.RESTRICTION_TYPE_OFFICIAL_BUILD)
                     && (!ChromeVersionInfo.isOfficialBuild())) {
                 return true;
             }
             if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_DEVICE_DAYDREAM)
                     || TextUtils.equals(restriction,
                                ChromeRestriction.RESTRICTION_TYPE_DEVICE_NON_DAYDREAM)) {
                 boolean isDaydream = isDaydreamReady();
                 if (TextUtils.equals(
                             restriction, ChromeRestriction.RESTRICTION_TYPE_DEVICE_DAYDREAM)
@@ skipping 30 matching lines @@
                 } else if (TextUtils.equals(restriction,
                                    ChromeRestriction.RESTRICTION_TYPE_WEBVR_UNSUPPORTED)
                         && webvrSupported) {
                     return true;
                 }
             }
             return false;
         }
     }
 
-    private class ChromeDisableIfSkipCheck extends DisableIfSkipCheck {
-
+    static class ChromeDisableIfSkipCheck extends DisableIfSkipCheck {
         private final Context mTargetContext;
 
         public ChromeDisableIfSkipCheck(Context targetContext) {
             mTargetContext = targetContext;
         }
 
         @Override
         protected boolean deviceTypeApplies(String type) {
             if (TextUtils.equals(type, ChromeDisableIf.PHONE)
-                    && !DeviceFormFactor.isTablet(getTargetContext())) {
+                    && !DeviceFormFactor.isTablet(mTargetContext)) {
                 return true;
             }
             if (TextUtils.equals(type, ChromeDisableIf.TABLET)
-                    && DeviceFormFactor.isTablet(getTargetContext())) {
+                    && DeviceFormFactor.isTablet(mTargetContext)) {
                 return true;
             }
             if (TextUtils.equals(type, ChromeDisableIf.LARGETABLET)
-                    && DeviceFormFactor.isLargeTablet(getTargetContext())) {
+                    && DeviceFormFactor.isLargeTablet(mTargetContext)) {
                 return true;
             }
             return false;
         }
     }
 }