Android: Simplify isTablet and InterfaceRegistrars

services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java

Index: services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java
diff --git a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java b/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java
index 3801896e2b0be3d05a78a06907aa2b41af1228a3..f74b119d9b3b12f460ea5939f9e7393a4db35e10 100644
--- a/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java
+++ b/services/device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java
@@ -41,6 +41,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.Callback;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.device.mojom.Nfc.CancelAllWatchesResponse;
 import org.chromium.device.mojom.Nfc.CancelPushResponse;
@@ -106,7 +107,7 @@ public class NFCTest {
      */
     private static class TestNfcImpl extends NfcImpl {
         public TestNfcImpl(Context context, NfcDelegate delegate) {
-            super(context, 0, delegate);
+            super(0, delegate);
         }
 
         public void processPendingOperationsForTesting(NfcTagHandler handler) {
@@ -157,6 +158,7 @@ public class NFCTest {
             doNothing().when(mNfcTagHandler).close();
         } catch (IOException | FormatException e) {
         }
+        ContextUtils.initApplicationContextForTests(mContext);
     }
 
     /**