Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java

Issue 22978010: [Android] Remove all usage of com.google.common.collect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nyquist fixes Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
index 2b51c22abdd9b164acd8586c05b8403389166622..eca18512f2ffd4a6b6896febc09cadbf7f831a90 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
@@ -4,26 +4,13 @@
package org.chromium.content.browser;
-import org.chromium.base.ActivityStatus;
-import org.chromium.base.test.util.Feature;
-import org.chromium.content.app.LibraryLoader;
-import org.chromium.content.common.CommandLine;
-import org.chromium.content.common.ProcessInitException;
-import org.chromium.content_shell_apk.ContentShellApplication;
-
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.UiThreadTest;
import android.hardware.Sensor;
-import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
import android.os.Handler;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
-import com.google.common.collect.Sets;
-
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
import java.util.Set;
@@ -95,7 +82,8 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
mDeviceMotionAndOrientation.mActiveSensors.containsAll(
DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS));
- Set<Integer> union = Sets.newHashSet(DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS);
+ Set<Integer> union = new HashSet<Integer>(
+ DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS);
union.addAll(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS);
assertEquals(union.size(), mDeviceMotionAndOrientation.mActiveSensors.size());
@@ -144,7 +132,7 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
mDeviceMotionAndOrientation.mActiveSensors.containsAll(
DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS));
- Set<Integer> diff = Sets.newHashSet(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS);
+ Set<Integer> diff = new HashSet<Integer>(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS);
diff.removeAll(DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS);
assertEquals(diff.size(), mMockSensorManager.numUnRegistered);

Powered by Google App Engine
This is Rietveld 408576698