| 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 e42fc48f0a47ab6cca3fca1b83949dc173e11d48..09485e348783d206d1aa987c94c04a15e046f03b 100644
|
| --- a/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java
|
| +++ b/net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java
|
| @@ -44,6 +44,7 @@
|
| 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;
|
| @@ -56,13 +57,11 @@
|
| 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;
|
| @@ -99,7 +98,7 @@
|
| @Before
|
| public void setUp() {
|
| MockitoAnnotations.initMocks(this);
|
| - ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application);
|
| + ContextUtils.initApplicationContextForTests(Robolectric.application);
|
| }
|
|
|
| @After
|
| @@ -240,13 +239,13 @@
|
|
|
| // Verify that the broadcast receiver is registered
|
| Intent intent = new Intent(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION);
|
| - ShadowApplication shadowApplication = ShadowApplication.getInstance();
|
| + ShadowApplication shadowApplication = Robolectric.getShadowApplication();
|
| 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(ShadowApplication.getInstance().getApplicationContext(), intent);
|
| + receiver.onReceive(Robolectric.getShadowApplication().getApplicationContext(), intent);
|
|
|
| // Verify that the auth token is properly requested from the account manager.
|
| verify(sMockAccountManager).getAuthToken(
|
|
|