Fix a bunch of Java Checkstyle issues.

BUG=318404
TBR=samuong@chromium.org

Review URL: https://codereview.chromium.org/744453002

Cr-Commit-Position: refs/heads/master@{#305047}

3 files changed, 12 insertions, 12 deletions

diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
index 3d96e03..64fdb48 100644
--- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
+++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
@@ -115,8 +115,8 @@ public class InvalidationIntentProtocol {
 
     /** Returns whether {@code intent} is a registered types change intent. */
     public static boolean isRegisteredTypesChange(Intent intent) {
-        return intent.hasExtra(EXTRA_REGISTERED_TYPES) ||
-                intent.hasExtra(EXTRA_REGISTERED_OBJECT_SOURCES);
+        return intent.hasExtra(EXTRA_REGISTERED_TYPES)
+                || intent.hasExtra(EXTRA_REGISTERED_OBJECT_SOURCES);
     }
 
     /** Returns the object ids for which to register contained in the intent. */
@@ -125,8 +125,8 @@ public class InvalidationIntentProtocol {
                 intent.getIntegerArrayListExtra(EXTRA_REGISTERED_OBJECT_SOURCES);
         ArrayList<String> objectNames =
                 intent.getStringArrayListExtra(EXTRA_REGISTERED_OBJECT_NAMES);
-        if (objectSources == null || objectNames == null ||
-                objectSources.size() != objectNames.size()) {
+        if (objectSources == null || objectNames == null
+                || objectSources.size() != objectNames.size()) {
             return null;
         }
         Set<ObjectId> objectIds = new HashSet<ObjectId>(objectSources.size());
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 d26be87..6f49d1f 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -289,9 +289,9 @@ public class AccountManagerHelper {
     private void onGotAuthTokenResult(Account account, String authTokenType, String authToken,
             GetAuthTokenCallback callback, AtomicInteger numTries, AtomicBoolean errorEncountered,
             ConnectionRetry retry) {
-        if (authToken != null || !errorEncountered.get() ||
-                numTries.incrementAndGet() == MAX_TRIES ||
-                !NetworkChangeNotifier.isInitialized()) {
+        if (authToken != null || !errorEncountered.get()
+                || numTries.incrementAndGet() == MAX_TRIES
+                || !NetworkChangeNotifier.isInitialized()) {
             callback.tokenAvailable(authToken);
             return;
         }
diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
index ab8fc08..9c8fc37 100644
--- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
+++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
@@ -94,9 +94,9 @@ public class MockSyncContentResolverDelegate implements SyncContentResolverDeleg
         String key = createKey(account, authority);
         synchronized (mSyncableMapLock) {
             if (!mIsSyncableMap.containsKey(key) || !mIsSyncableMap.get(key)) {
-                throw new IllegalArgumentException("Account " + account +
-                        " is not syncable for authority " + authority +
-                        ". Can not set sync state to " + sync);
+                throw new IllegalArgumentException("Account " + account
+                        + " is not syncable for authority " + authority
+                        + ". Can not set sync state to " + sync);
             }
             if (sync) {
                 mSyncAutomaticallySet.add(key);
@@ -129,8 +129,8 @@ public class MockSyncContentResolverDelegate implements SyncContentResolverDeleg
                     }
                     break;
                 default:
-                    throw new IllegalArgumentException("Unable to understand syncable argument: " +
-                            syncable);
+                    throw new IllegalArgumentException("Unable to understand syncable argument: "
+                            + syncable);
             }
         }
         notifyObservers();