| Index: chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundOfflinerTaskTest.java
|
| diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundOfflinerTaskTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundOfflinerTaskTest.java
|
| index 164377e4fcd11b56c5b774c7cf528880b04f5872..078783556aec0f8812147da4b5db51955e0afaf6 100644
|
| --- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundOfflinerTaskTest.java
|
| +++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundOfflinerTaskTest.java
|
| @@ -20,6 +20,16 @@ import android.os.Bundle;
|
| import com.google.android.gms.gcm.GcmNetworkManager;
|
| import com.google.android.gms.gcm.Task;
|
|
|
| +import org.junit.After;
|
| +import org.junit.Before;
|
| +import org.junit.Test;
|
| +import org.junit.runner.RunWith;
|
| +import org.mockito.Mock;
|
| +import org.mockito.MockitoAnnotations;
|
| +import org.robolectric.RuntimeEnvironment;
|
| +import org.robolectric.annotation.Config;
|
| +import org.robolectric.internal.ShadowExtractor;
|
| +
|
| import org.chromium.base.ActivityState;
|
| import org.chromium.base.ApplicationStatus;
|
| import org.chromium.base.BaseChromiumApplication;
|
| @@ -30,15 +40,6 @@ import org.chromium.base.metrics.RecordHistogram;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.chrome.browser.ChromeBackgroundServiceWaiter;
|
| import org.chromium.net.ConnectionType;
|
| -import org.junit.After;
|
| -import org.junit.Before;
|
| -import org.junit.Test;
|
| -import org.junit.runner.RunWith;
|
| -import org.mockito.Mock;
|
| -import org.mockito.MockitoAnnotations;
|
| -import org.robolectric.RuntimeEnvironment;
|
| -import org.robolectric.annotation.Config;
|
| -import org.robolectric.internal.ShadowExtractor;
|
|
|
| /**
|
| * Unit tests for BackgroundOfflinerTask.
|
| @@ -115,7 +116,7 @@ public class BackgroundOfflinerTaskTest {
|
| ChromeBackgroundServiceWaiter waiter = new ChromeBackgroundServiceWaiter(1000);
|
| task.processBackgroundRequests(mTaskExtras, mDeviceConditions, waiter);
|
|
|
| - // Check with ShadowBackgroundBackgroundSchedulerProcessor that it started processing.
|
| + // Check with BackgroundSchedulerProcessor that it started processing.
|
| assertTrue(mStubBackgroundSchedulerProcessor.getDidStartProcessing());
|
| assertSame(mDeviceConditions, mStubBackgroundSchedulerProcessor.getDeviceConditions());
|
|
|
| @@ -132,10 +133,10 @@ public class BackgroundOfflinerTaskTest {
|
| ChromeBackgroundServiceWaiter waiter = new ChromeBackgroundServiceWaiter(1000);
|
| task.processBackgroundRequests(mTaskExtras, mDeviceConditions, waiter);
|
|
|
| - // Check with ShadowBackgroundBackgroundSchedulerProcessor that it did not start.
|
| + // Check with BackgroundSchedulerProcessor that it did not start.
|
| assertFalse(mStubBackgroundSchedulerProcessor.getDidStartProcessing());
|
|
|
| - // The waiter should not block if startProcessing returned false.
|
| + // The waiter should not block if startScheduledProcessing returned false.
|
| waiter.startWaiting();
|
| }
|
|
|
| @@ -154,7 +155,7 @@ public class BackgroundOfflinerTaskTest {
|
| assertEquals(mTriggerConditions,
|
| TaskExtrasPacker.unpackTriggerConditionsFromBundle(gcmTask.getExtras()));
|
|
|
| - // Check with ShadowBackgroundBackgroundSchedulerProcessor that startProcessing got called.
|
| + // Check with BackgroundSchedulerProcessor that startScheduledProcessing got called.
|
| assertTrue(mStubBackgroundSchedulerProcessor.getDidStartProcessing());
|
| assertSame(mDeviceConditions, mStubBackgroundSchedulerProcessor.getDeviceConditions());
|
| }
|
| @@ -178,7 +179,7 @@ public class BackgroundOfflinerTaskTest {
|
| assertEquals(mTriggerConditions,
|
| TaskExtrasPacker.unpackTriggerConditionsFromBundle(gcmTask.getExtras()));
|
|
|
| - // Check that startProcessing was NOT called.
|
| + // Check that startScheduledProcessing was NOT called.
|
| assertFalse(mStubBackgroundSchedulerProcessor.getDidStartProcessing());
|
|
|
| // Now verify low battery level but with power connected will start processing.
|
| @@ -212,7 +213,7 @@ public class BackgroundOfflinerTaskTest {
|
| assertEquals(mTriggerConditions,
|
| TaskExtrasPacker.unpackTriggerConditionsFromBundle(gcmTask.getExtras()));
|
|
|
| - // Check that startProcessing was NOT called.
|
| + // Check that startScheduledProcessing was NOT called.
|
| assertFalse(mStubBackgroundSchedulerProcessor.getDidStartProcessing());
|
|
|
| // Now verify will start processing when Activity is stopped.
|
|
|