Revert of Convert ChromeSyncShell to use ChromePublic infrastructure (patchset #7 id:120001 of https://codereview.chromium.org/1282603005/ )

Reason for revert:
broke ChromeSyncShell build.
http://build.chromium.org/p/chromium.linux/builders/Android%20Arm64%20Builder%20%28dbg%29/builds/22336/steps/compile/logs/stdio

Original issue's description:
> Convert ChromeSyncShell to use ChromePublic infrastructure
>
> Several test fixes are included to support this change.
>
> Note: This CL only provides a GYP implementation (no GN). This is not a
> regression from the previous state.
>
> BUG=510211
>
> Committed: https://crrev.com/62ca3f0326203cca221bba6f0ee038ff292ecc66
> Cr-Commit-Position: refs/heads/master@{#344128}

TBR=jbudorick@chromium.org,newt@chromium.org,pvalenzuela@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=510211

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

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

2 files changed, 0 insertions, 7 deletions

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 532abe1..a9f8239 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,7 +27,6 @@ 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;
 
@@ -89,7 +88,6 @@ 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
@@ -136,7 +134,6 @@ public class MockAccountManager implements AccountManagerDelegate {
         }
     }
 
-    @VisibleForTesting
     public boolean addAccountHolderExplicitly(AccountHolder accountHolder) {
         return addAccountHolderExplicitly(accountHolder, false);
     }
@@ -157,7 +154,6 @@ public class MockAccountManager implements AccountManagerDelegate {
         return result;
     }
 
-    @VisibleForTesting
     public boolean removeAccountHolderExplicitly(AccountHolder accountHolder) {
         return removeAccountHolderExplicitly(accountHolder, false);
     }
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 26b9db5..b467d26 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
@@ -14,7 +14,6 @@ import android.os.Bundle;
 import junit.framework.Assert;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.VisibleForTesting;
 import org.chromium.sync.SyncContentResolverDelegate;
 
 import java.util.HashMap;
@@ -71,7 +70,6 @@ public class MockSyncContentResolverDelegate implements SyncContentResolverDeleg
     }
 
     @Override
-    @VisibleForTesting
     public void setMasterSyncAutomatically(boolean sync) {
         if (mMasterSyncAutomatically == sync) return;
 
@@ -172,7 +170,6 @@ public class MockSyncContentResolverDelegate implements SyncContentResolverDeleg
      *
      * @throws InterruptedException
      */
-    @VisibleForTesting
     public void waitForLastNotificationCompleted() throws InterruptedException {
         Assert.assertTrue("Timed out waiting for notifications to complete.",
                 mPendingObserverCount.tryAcquire(5, TimeUnit.SECONDS));