Convert ChromeSyncShell to use ChromePublic infrastructure (try #2)

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

Index: sync/test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
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 b467d26753a290658f204d6763b7d792c4f10501..26b9db574b28c5a32f93c80d72773d6b0c1ff653 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,6 +14,7 @@ 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;
@@ -70,6 +71,7 @@ public class MockSyncContentResolverDelegate implements SyncContentResolverDeleg
     }
 
     @Override
+    @VisibleForTesting
     public void setMasterSyncAutomatically(boolean sync) {
         if (mMasterSyncAutomatically == sync) return;
 
@@ -170,6 +172,7 @@ 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));