Remove more wrappers in favor of new Robolectric support

Bug: 76167422
Test: robotests
Change-Id: Ic71a181bee6f90f25f9fa2a748cf708887495394

src/com/android/settings/connecteddevice/usb/UsbBackend.java

@@ -25,7 +25,6 @@ import android.net.ConnectivityManager;
 import android.os.UserManager;
 import android.support.annotation.VisibleForTesting;
 
-import com.android.settings.wrapper.UsbManagerWrapper;
 import com.android.settings.wrapper.UserManagerWrapper;
 
 /**
@@ -44,7 +43,6 @@ public class UsbBackend {
     private final boolean mTetheringSupported;
 
     private UsbManager mUsbManager;
-    private UsbManagerWrapper mUsbManagerWrapper;
 
     @Nullable
     private UsbPort mPort;
@@ -52,19 +50,13 @@ public class UsbBackend {
     private UsbPortStatus mPortStatus;
 
     public UsbBackend(Context context) {
-        this(context, new UserManagerWrapper(UserManager.get(context)), null);
+        this(context, new UserManagerWrapper(UserManager.get(context)));
     }
 
     @VisibleForTesting
-    public UsbBackend(Context context, UserManagerWrapper userManagerWrapper,
-            UsbManagerWrapper usbManagerWrapper) {
+    public UsbBackend(Context context, UserManagerWrapper userManagerWrapper) {
         mUsbManager = context.getSystemService(UsbManager.class);
 
-        mUsbManagerWrapper = usbManagerWrapper;
-        if (mUsbManagerWrapper == null) {
-            mUsbManagerWrapper = new UsbManagerWrapper(mUsbManager);
-        }
-
         mFileTransferRestricted = userManagerWrapper.isUsbFileTransferRestricted();
         mFileTransferRestrictedBySystem = userManagerWrapper.isUsbFileTransferRestrictedBySystem();
         mTetheringRestricted = userManagerWrapper.isUsbTetheringRestricted();
@@ -79,7 +71,7 @@ public class UsbBackend {
     }
 
     public long getCurrentFunctions() {
-        return mUsbManagerWrapper.getCurrentFunctions();
+        return mUsbManager.getCurrentFunctions();
     }
 
     public void setCurrentFunctions(long functions) {