diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 12:09:21 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 12:09:21 +0000 |
| commit | fd3bada18919e5325440c644e8ca6aa584b2560a (patch) | |
| tree | 1ae7b88973b85ba7723c83bf7b58f7f16230032e /sync | |
| parent | f983bded8bea58ff778164462cc95b977e748afa (diff) | |
| download | chromium_src-fd3bada18919e5325440c644e8ca6aa584b2560a.zip chromium_src-fd3bada18919e5325440c644e8ca6aa584b2560a.tar.gz chromium_src-fd3bada18919e5325440c644e8ca6aa584b2560a.tar.bz2 | |
Upstream Chrome sync adapter.
This upstreams the Chrome sync adapter, and adds tests for it. It also
adds it to the manifest for the Chromium testshell.
Since downstream still uses a synchronous startup, the sync adapter
supports both synchronous and asynchronous startup.
BUG=272584
Review URL: https://chromiumcodereview.appspot.com/23004003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java | 11 | ||||
| -rw-r--r-- | sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java | 6 |
2 files changed, 0 insertions, 17 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 943785d..663ca00 100644 --- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java +++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationController.java @@ -139,17 +139,6 @@ 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 SyncStatusHelper.get(mContext).getContractAuthority(); - } - - /** * Returns the instance that will use {@code context} to issue intents. * * Calling this method will create the instance if it does not yet exist. diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java index 8cc270d..215430b 100644 --- a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java +++ b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java @@ -277,12 +277,6 @@ public class InvalidationControllerTest extends InstrumentationTestCase { assertEquals(true, resultAllTypes.get()); } - @SmallTest - @Feature({"Sync"}) - public void testGetContractAuthority() throws Exception { - assertEquals(mContext.getPackageName(), mController.getContractAuthority()); - } - /** * Asserts that {@code intent} is destined for the correct component. */ |