Revert of [DeviceService] Add service tests for VibrationManager.

device/vibration/android/java/src/org/chromium/device/vibration/VibrationManagerImpl.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.device.vibration;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.os.Vibrator;
 import android.util.Log;
 
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.device.mojom.VibrationManager;
 import org.chromium.mojo.system.MojoException;
 import org.chromium.services.service_manager.InterfaceFactory;
 
 /**
  * Android implementation of the vibration manager service defined in
  * device/vibration/vibration_manager.mojom.
  */
-@JNINamespace("device")
 public class VibrationManagerImpl implements VibrationManager {
     private static final String TAG = "VibrationManagerImpl";
 
     private static final long MINIMUM_VIBRATION_DURATION_MS = 1; // 1 millisecond
     private static final long MAXIMUM_VIBRATION_DURATION_MS = 10000; // 10 seconds
 
     private final AudioManager mAudioManager;
     private final Vibrator mVibrator;
     private final boolean mHasVibratePermission;
 
-    private static long sVibrateMilliSecondsForTesting = -1;
-    private static boolean sVibrateCancelledForTesting = false;
+    private static AndroidVibratorWrapper sVibratorWrapper;
+
+    /**
+     * Android Vibrator wrapper class provided to test code to extend.
+     */
+    @VisibleForTesting
+    public static class AndroidVibratorWrapper {
+        protected AndroidVibratorWrapper() {}
+
+        public void vibrate(Vibrator vibrator, long milliseconds) {
+            vibrator.vibrate(milliseconds);
+        }
+
+        public void cancel(Vibrator vibrator) {
+            vibrator.cancel();
+        }
+    }
+
+    // Test code can use this function to inject other wrapper for testing.
+    public static void setVibratorWrapperForTesting(AndroidVibratorWrapper wrapper) {
+        sVibratorWrapper = wrapper;
+    }
 
     public VibrationManagerImpl(Context context) {
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+        if (sVibratorWrapper == null) {
+            sVibratorWrapper = new AndroidVibratorWrapper();
+        }
         // TODO(mvanouwerkerk): What happens if permission is revoked? Handle this better.
         mHasVibratePermission =
                 context.checkCallingOrSelfPermission(android.Manifest.permission.VIBRATE)
                 == PackageManager.PERMISSION_GRANTED;
         if (!mHasVibratePermission) {
             Log.w(TAG, "Failed to use vibrate API, requires VIBRATE permission.");
         }
     }
 
     @Override
     public void close() {}
 
     @Override
     public void onConnectionError(MojoException e) {}
 
     @Override
     public void vibrate(long milliseconds, VibrateResponse callback) {
         // Though the Blink implementation already sanitizes vibration times, don't
         // trust any values passed from the client.
         long sanitizedMilliseconds = Math.max(MINIMUM_VIBRATION_DURATION_MS,
                 Math.min(milliseconds, MAXIMUM_VIBRATION_DURATION_MS));
 
         if (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_SILENT
                 && mHasVibratePermission) {
-            mVibrator.vibrate(sanitizedMilliseconds);
+            sVibratorWrapper.vibrate(mVibrator, sanitizedMilliseconds);
         }
-        setVibrateMilliSecondsForTesting(sanitizedMilliseconds);
         callback.call();
     }
 
     @Override
     public void cancel(CancelResponse callback) {
-        if (mHasVibratePermission) {
-            mVibrator.cancel();
-        }
-        setVibrateCancelledForTesting(true);
+        if (mHasVibratePermission) sVibratorWrapper.cancel(mVibrator);
         callback.call();
     }
 
     /**
      * A factory for implementations of the VibrationManager interface.
      */
     public static class Factory implements InterfaceFactory<VibrationManager> {
         private Context mContext;
         public Factory(Context context) {
             mContext = context;
         }
 
         @Override
         public VibrationManager createImpl() {
             return new VibrationManagerImpl(mContext);
         }
     }
-
-    static void setVibrateMilliSecondsForTesting(long milliseconds) {
-        sVibrateMilliSecondsForTesting = milliseconds;
-    }
-
-    static void setVibrateCancelledForTesting(boolean cancelled) {
-        sVibrateCancelledForTesting = cancelled;
-    }
-
-    @CalledByNative
-    static long getVibrateMilliSecondsForTesting() {
-        return sVibrateMilliSecondsForTesting;
-    }
-
-    @CalledByNative
-    static boolean getVibrateCancelledForTesting() {
-        return sVibrateCancelledForTesting;
-    }
 }