Index: net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java |
diff --git a/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java b/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java |
index 09485e348783d206d1aa987c94c04a15e046f03b..e42fc48f0a47ab6cca3fca1b83949dc173e11d48 100644 |
--- a/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java |
+++ b/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java |
@@ -44,7 +44,6 @@ import junit.framework.Assert; |
import org.chromium.base.ApplicationStatus; |
import org.chromium.base.BaseChromiumApplication; |
import org.chromium.base.ContextUtils; |
-import org.chromium.base.test.shadows.ShadowMultiDex; |
import org.chromium.net.HttpNegotiateAuthenticator.GetAccountsCallback; |
import org.chromium.net.HttpNegotiateAuthenticator.RequestData; |
import org.chromium.testing.local.LocalRobolectricTestRunner; |
@@ -57,11 +56,13 @@ import org.mockito.Captor; |
import org.mockito.Mock; |
import org.mockito.MockitoAnnotations; |
import org.robolectric.Robolectric; |
+import org.robolectric.RuntimeEnvironment; |
import org.robolectric.annotation.Config; |
import org.robolectric.annotation.Implementation; |
import org.robolectric.annotation.Implements; |
import org.robolectric.shadows.ShadowAccountManager; |
import org.robolectric.shadows.ShadowApplication; |
+import org.robolectric.shadows.multidex.ShadowMultiDex; |
import java.io.IOException; |
import java.util.List; |
@@ -98,7 +99,7 @@ public class HttpNegotiateAuthenticatorTest { |
@Before |
public void setUp() { |
MockitoAnnotations.initMocks(this); |
- ContextUtils.initApplicationContextForTests(Robolectric.application); |
+ ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application); |
} |
@After |
@@ -239,13 +240,13 @@ public class HttpNegotiateAuthenticatorTest { |
// Verify that the broadcast receiver is registered |
Intent intent = new Intent(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION); |
- ShadowApplication shadowApplication = Robolectric.getShadowApplication(); |
+ ShadowApplication shadowApplication = ShadowApplication.getInstance(); |
List<BroadcastReceiver> receivers = shadowApplication.getReceiversForIntent(intent); |
assertThat("There is one registered broadcast receiver", receivers.size(), equalTo(1)); |
// Send the intent to the receiver. |
BroadcastReceiver receiver = receivers.get(0); |
- receiver.onReceive(Robolectric.getShadowApplication().getApplicationContext(), intent); |
+ receiver.onReceive(ShadowApplication.getInstance().getApplicationContext(), intent); |
// Verify that the auth token is properly requested from the account manager. |
verify(sMockAccountManager).getAuthToken( |