Fix Java style issues in sync/android

sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java

Index: sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
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 99dc0bb52bb6506f6196f97c765bc44ee9005e08..e8d89d9e22e360ecc98753f933d0f2d440ef57ca 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -42,7 +42,7 @@ public class AccountManagerHelper {
 
     public static final String GOOGLE_ACCOUNT_TYPE = "com.google";
 
-    private static final Object lock = new Object();
+    private static final Object sLock = new Object();

[nyquist, 2013/12/12 01:29:13]

LOCK?

[aurimas (slooooooooow), 2013/12/12 01:36:57]

BUT THIS IS NOT A CONSTANT, IT IS STATIC

[nyquist, 2013/12/12 02:03:44]

It is static final, which means it can never change, across any instance of this
class. How is that not a constant? Also, see |TAG| above or |MAX_TRIES| below.

 
     private static final int MAX_TRIES = 3;
 
@@ -82,7 +82,7 @@ public class AccountManagerHelper {
      * @return a singleton instance of the AccountManagerHelper
      */
     public static AccountManagerHelper get(Context context) {
-        synchronized (lock) {
+        synchronized (sLock) {
             if (sAccountManagerHelper == null) {
                 sAccountManagerHelper = new AccountManagerHelper(context,
                         new SystemAccountManagerDelegate(context));
@@ -94,7 +94,7 @@ public class AccountManagerHelper {
     @VisibleForTesting
     public static void overrideAccountManagerHelperForTests(Context context,
             AccountManagerDelegate accountManager) {
-        synchronized (lock) {
+        synchronized (sLock) {
             sAccountManagerHelper = new AccountManagerHelper(context, accountManager);
         }
     }
@@ -162,10 +162,10 @@ public class AccountManagerHelper {
      */
     @Deprecated
     public String getAuthTokenFromBackground(Account account, String authTokenType) {
-            AccountManagerFuture<Bundle> future = mAccountManager.getAuthToken(account,
-                    authTokenType, false, null, null);
-            AtomicBoolean errorEncountered = new AtomicBoolean(false);
-            return getAuthTokenInner(future, errorEncountered);
+        AccountManagerFuture<Bundle> future = mAccountManager.getAuthToken(account,
+                authTokenType, false, null, null);
+        AtomicBoolean errorEncountered = new AtomicBoolean(false);
+        return getAuthTokenInner(future, errorEncountered);
     }
 
     /**