2 files changed, 7 insertions, 1 deletions
diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
index 1b346a1..cff504c 100644
--- a/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
+++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
@@ -48,6 +48,10 @@ public class AccountHolder {
         return mPassword;
     }
 
+    public boolean hasAuthTokenRegistered(String authTokenType) {
+        return mAuthTokens.containsKey(authTokenType);
+    }
+
     public String getAuthToken(String authTokenType) {
         return mAuthTokens.get(authTokenType);
     }
diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
index da16fae..cb330b8 100644
--- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
+++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
@@ -264,7 +264,9 @@ public class MockAccountManager implements AccountManagerDelegate {
 
     private String internalGenerateAndStoreAuthToken(AccountHolder ah, String authTokenType) {
         synchronized (mAccounts) {
-            if (ah.getAuthToken(authTokenType) == null) {
+            // Some tests register auth tokens with value null, and those should be preserved.
+            if (!ah.hasAuthTokenRegistered(authTokenType) &&
+                    ah.getAuthToken(authTokenType) == null) {
                 // No authtoken registered. Need to create one.
                 String authToken = UUID.randomUUID().toString();
                 Log.d(TAG, "Created new auth token for " + ah.getAccount() +