summaryrefslogtreecommitdiffstats
path: root/chrome/android
diff options
context:
space:
mode:
authoracleung@chromium.org <acleung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 03:33:21 +0000
committeracleung@chromium.org <acleung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 03:33:21 +0000
commitdeb2998aa46dbd49fe6951c0d1fc84fb717ab61c (patch)
tree569f8121a6fdcb4ec0b53c1cb61e5b238f6cbea5 /chrome/android
parentfeefcc4f87496c96c8c8de98d9186f1c7ad88d05 (diff)
downloadchromium_src-deb2998aa46dbd49fe6951c0d1fc84fb717ab61c.zip
chromium_src-deb2998aa46dbd49fe6951c0d1fc84fb717ab61c.tar.gz
chromium_src-deb2998aa46dbd49fe6951c0d1fc84fb717ab61c.tar.bz2
Fix issues with token refresh in AccountReconcilor
The CL was change a bit as suggested by the reviewers. This CL now introduces a worklist model in GoogleAutoLoginHelper. Instead of firing all the refresh token events in a row, it queues up all the login requests and insert GAIA cookies one-by-one. This would let accounts to be appended instead of overwriting one another. This also introduces GoogleAutoLoginHelperTest for some unit testing. BUG=305249 Review URL: https://codereview.chromium.org/63253003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android')
-rw-r--r--chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java
index c2d2334..fce6f08 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java
@@ -212,8 +212,9 @@ public class OAuth2TokenServiceIntegrationTest extends ChromiumTestShellTestBase
// Run test.
mOAuth2TokenService.validateAccounts(mContext);
- // Ensure no calls have been made to the observer.
- assertEquals(1, mObserver.getAvailableCallCount());
+ // All accounts will be notified. It is up to the observer
+ // to design if any action is needed.
+ assertEquals(2, mObserver.getAvailableCallCount());
assertEquals(0, mObserver.getRevokedCallCount());
assertEquals(0, mObserver.getLoadedCallCount());
}