Convert ChromeSyncShell to use ChromePublic infrastructure (try #2)

sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java

Index: sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
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 a9f8239c1e1a59afd78389bd4620b5367fda6c73..532abe1dbf6783c0be21eba7c3946f7119489719 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
@@ -27,6 +27,7 @@ import android.os.Handler;
 import android.text.TextUtils;
 
 import org.chromium.base.Log;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.sync.signin.AccountManagerDelegate;
 import org.chromium.sync.signin.AccountManagerHelper;
 
@@ -88,6 +89,7 @@ public class MockAccountManager implements AccountManagerDelegate {
 
     private final SingleThreadedExecutor mExecutor;
 
+    @VisibleForTesting
     public MockAccountManager(Context context, Context testContext, Account... accounts) {
         mContext = context;
         // The manifest that is backing testContext needs to provide the
@@ -134,6 +136,7 @@ public class MockAccountManager implements AccountManagerDelegate {
         }
     }
 
+    @VisibleForTesting
     public boolean addAccountHolderExplicitly(AccountHolder accountHolder) {
         return addAccountHolderExplicitly(accountHolder, false);
     }
@@ -154,6 +157,7 @@ public class MockAccountManager implements AccountManagerDelegate {
         return result;
     }
 
+    @VisibleForTesting
     public boolean removeAccountHolderExplicitly(AccountHolder accountHolder) {
         return removeAccountHolderExplicitly(accountHolder, false);
     }