Chromium Code Reviews| Index: chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java |
| diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java |
| index b1bf658644b556bc8a9f3689d544b6bab25925bd..76f3e4ac5cd8b2cddb9d89c5b3b6e26e8008037b 100644 |
| --- a/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java |
| +++ b/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java |
| @@ -12,6 +12,17 @@ import android.content.pm.ApplicationInfo; |
| import android.content.pm.PackageInfo; |
| import android.os.Bundle; |
| +import org.junit.Assert; |
| +import org.junit.Before; |
| +import org.junit.Test; |
| +import org.junit.runner.RunWith; |
| +import org.robolectric.Robolectric; |
| +import org.robolectric.Shadows; |
| +import org.robolectric.annotation.Config; |
| +import org.robolectric.res.builder.RobolectricPackageManager; |
| +import org.robolectric.shadows.ShadowActivity; |
| +import org.robolectric.shadows.ShadowLooper; |
| + |
| import org.chromium.base.ActivityState; |
| import org.chromium.base.ApplicationState; |
| import org.chromium.base.ApplicationStatus; |
| @@ -27,16 +38,6 @@ import org.chromium.components.sync.notifier.InvalidationIntentProtocol; |
| import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate; |
| import org.chromium.testing.local.CustomShadowAsyncTask; |
| import org.chromium.testing.local.LocalRobolectricTestRunner; |
| -import org.junit.Assert; |
| -import org.junit.Before; |
| -import org.junit.Test; |
| -import org.junit.runner.RunWith; |
| -import org.robolectric.Robolectric; |
| -import org.robolectric.Shadows; |
| -import org.robolectric.annotation.Config; |
| -import org.robolectric.res.builder.RobolectricPackageManager; |
| -import org.robolectric.shadows.ShadowActivity; |
| -import org.robolectric.shadows.ShadowLooper; |
| import java.util.HashSet; |
| import java.util.Set; |
| @@ -46,7 +47,7 @@ import java.util.concurrent.atomic.AtomicBoolean; |
| * Tests for the {@link InvalidationController}. |
| */ |
| @RunWith(LocalRobolectricTestRunner.class) |
| -@Config(manifest = Config.NONE, shadows = {CustomShadowAsyncTask.class}) |
| +@Config(manifest = Config.NONE, shadows = {CustomShadowAsyncTask.class}, sdk = 21) |
|
jbudorick
2017/03/13 22:36:54
super-nit: You have sdk before shadows in some cas
mikecase (-- gone --)
2017/03/14 18:08:39
Done
|
| public class InvalidationControllerTest { |
| /** |
| * Stubbed out ProfileSyncService with a setter to control return value of |