diff options
Diffstat (limited to 'sync/android')
4 files changed, 24 insertions, 6 deletions
diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java index 03255d1..5503e8e 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java +++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java @@ -140,9 +140,13 @@ public class InvalidationController implements ActivityStatus.StateListener { /** * Returns the contract authority to use when requesting sync. + * + * This method is deprecated. Use {@link SyncStatusHelper#getContractAuthority()} instead. + * TODO(nyquist) Remove this method once downstream uses the new method. */ + @Deprecated public String getContractAuthority() { - return mContext.getPackageName(); + return SyncStatusHelper.get(mContext).getContractAuthority(); } /** diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java index 963c417..b0a239d 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java +++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java @@ -379,7 +379,7 @@ public class InvalidationService extends AndroidListener { bundle.putString("payload", (payload == null) ? "" : payload); } Account account = ChromeSigninController.get(this).getSignedInUser(); - String contractAuthority = InvalidationController.get(this).getContractAuthority(); + String contractAuthority = SyncStatusHelper.get(this).getContractAuthority(); requestSyncFromContentResolver(bundle, account, contractAuthority); } diff --git a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java index 128bf7b5..b315769 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java +++ b/sync/android/java/src/org/chromium/sync/notifier/SyncStatusHelper.java @@ -131,8 +131,7 @@ public class SyncStatusHelper { SyncContentResolverDelegate syncContentResolverWrapper) { mApplicationContext = context.getApplicationContext(); mSyncContentResolverWrapper = syncContentResolverWrapper; - mContractAuthority = - InvalidationController.get(mApplicationContext).getContractAuthority(); + mContractAuthority = getContractAuthority(); updateMasterSyncAutomaticallySetting(); @@ -189,6 +188,13 @@ public class SyncStatusHelper { } /** + * Returns the contract authority to use when requesting sync. + */ + public String getContractAuthority() { + return mApplicationContext.getPackageName(); + } + + /** * Wrapper method for the ContentResolver.addStatusChangeListener(...) when we are only * interested in the settings type. */ diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java b/sync/android/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java index a6d3dc7..a2e83bc 100644 --- a/sync/android/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java +++ b/sync/android/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java @@ -63,8 +63,8 @@ public class SyncStatusHelperTest extends InstrumentationTestCase { ChromeSigninController.get( getInstrumentation().getTargetContext()).setSignedInAccountName( "account@example.com"); - mAuthority = InvalidationController.get( - getInstrumentation().getTargetContext()).getContractAuthority(); + mAuthority = SyncStatusHelper.get(getInstrumentation().getTargetContext()) + .getContractAuthority(); mTestAccount = new Account("account@example.com", "com.google"); mAlternateTestAccount = new Account("alternateAccount@example.com", "com.google"); super.setUp(); @@ -234,4 +234,12 @@ public class SyncStatusHelperTest extends InstrumentationTestCase { assertEquals(getSyncAutomaticallyAcalls + 1, mSyncContentResolverDelegate.mGetSyncAutomaticallyCalls); } + + @SmallTest + @Feature({"Sync"}) + public void testGetContractAuthority() throws Exception { + assertEquals("The contract authority should be the package name.", + getInstrumentation().getTargetContext().getPackageName(), + mHelper.getContractAuthority()); + } } |