summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authoraurimas <aurimas@chromium.org>2014-10-15 19:27:39 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-16 02:28:09 +0000
commit38aa15f1d56f69c0d2d265497ffeb6e8645e79ff (patch)
tree45273a1fae9b459a285735d716975abdc8197d63 /sync
parentb49b70f26e6d0f2f54bb87cf374f30a339c7d7c6 (diff)
downloadchromium_src-38aa15f1d56f69c0d2d265497ffeb6e8645e79ff.zip
chromium_src-38aa15f1d56f69c0d2d265497ffeb6e8645e79ff.tar.gz
chromium_src-38aa15f1d56f69c0d2d265497ffeb6e8645e79ff.tar.bz2
Fix Java indentation issues.
Fix indentation issue to allow enabling Checkstyle indentation rule. BUG=318404 Review URL: https://codereview.chromium.org/654293002 Cr-Commit-Position: refs/heads/master@{#299823}
Diffstat (limited to 'sync')
-rw-r--r--sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java12
-rw-r--r--sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java2
-rw-r--r--sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java14
-rw-r--r--sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java26
4 files changed, 28 insertions, 26 deletions
diff --git a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
index abeac4d..fae203b 100644
--- a/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
+++ b/sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
@@ -100,12 +100,12 @@ public enum ModelType {
}
private boolean isNonInvalidationType() {
- if ((this == SESSION || this == FAVICON_TRACKING) && LibraryLoader.isInitialized()) {
- return FieldTrialList
- .findFullName("AndroidSessionNotifications")
- .equals("Disabled");
- }
- return mNonInvalidationType;
+ if ((this == SESSION || this == FAVICON_TRACKING) && LibraryLoader.isInitialized()) {
+ return FieldTrialList
+ .findFullName("AndroidSessionNotifications")
+ .equals("Disabled");
+ }
+ return mNonInvalidationType;
}
/**
diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
index 7d4e4ab..d26be87 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -342,7 +342,7 @@ public class AccountManagerHelper {
AtomicInteger numTries = new AtomicInteger(0);
AtomicBoolean errorEncountered = new AtomicBoolean(false);
getAuthTokenAsynchronously(
- null, account, authTokenType, callback, numTries, errorEncountered, null);
+ null, account, authTokenType, callback, numTries, errorEncountered, null);
}
/**
diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
index a6835e4..beb0837 100644
--- a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
@@ -40,7 +40,7 @@ public class InvalidationClientNameProviderTest extends InstrumentationTestCase
// nothing will blow up if someone accidentally violates that constraint.)
byte[] id3 = mProvider.getInvalidatorClientName();
assertTrue("Changing generators should not affect returned ID consistency",
- Arrays.equals(id2, id3));
+ Arrays.equals(id2, id3));
}
@SmallTest
@@ -56,11 +56,11 @@ public class InvalidationClientNameProviderTest extends InstrumentationTestCase
}
private static void registerHardCodedGenerator(InvalidationClientNameProvider provider) {
- provider.setPreferredClientNameGenerator(
- new InvalidationClientNameGenerator() {
- public byte[] generateInvalidatorClientName() {
- return "Testable ID".getBytes();
- }
- });
+ provider.setPreferredClientNameGenerator(new InvalidationClientNameGenerator() {
+ @Override
+ public byte[] generateInvalidatorClientName() {
+ return "Testable ID".getBytes();
+ }
+ });
}
}
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 baf36cd..597fb95 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
@@ -188,18 +188,20 @@ public class MockAccountManager implements AccountManagerDelegate {
}
final AccountHolder accountHolder = getAccountHolder(account);
final boolean correctPassword = password.equals(accountHolder.getPassword());
- return runTask(mExecutor,
- new AccountManagerTask<Bundle>(handler, callback, new Callable<Bundle>() {
- @Override
- public Bundle call() throws Exception {
- Bundle result = new Bundle();
- result.putString(AccountManager.KEY_ACCOUNT_NAME, accountHolder.getAccount().name);
- result.putString(
- AccountManager.KEY_ACCOUNT_TYPE, AccountManagerHelper.GOOGLE_ACCOUNT_TYPE);
- result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, correctPassword);
- return result;
- }
- }));
+ return runTask(mExecutor, new AccountManagerTask<Bundle>(handler, callback,
+ new Callable<Bundle>() {
+ @Override
+ public Bundle call() throws Exception {
+ Bundle result = new Bundle();
+ result.putString(AccountManager.KEY_ACCOUNT_NAME,
+ accountHolder.getAccount().name);
+ result.putString(
+ AccountManager.KEY_ACCOUNT_TYPE,
+ AccountManagerHelper.GOOGLE_ACCOUNT_TYPE);
+ result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, correctPassword);
+ return result;
+ }
+ }));
}
@Override