Convert ChromeSyncShell to use ChromePublic infrastructure

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
index 7c7f4d16e41f76779410f9cc79627fdec6c85704..fe591bc3e6c49c507534d7e3ea8b3147e6109bc9 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
@@ -4,10 +4,8 @@
 
 package org.chromium.chrome.browser.sync;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.app.FragmentTransaction;
-import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.SwitchPreference;
@@ -22,10 +20,12 @@ import android.widget.TextView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.sync.ui.PassphraseCreationDialogFragment;
 import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment;
 import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment;
-import org.chromium.chrome.shell.R;
+import org.chromium.chrome.test.util.ActivityUtils;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -64,12 +64,12 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
                 SyncCustomizationFragment.PREFERENCE_SYNC_SETTINGS);
     }
 
-    private Activity mActivity;
+    private Preferences mPreferences;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mActivity = getActivity();
+        mPreferences = null;
     }
 
     @SmallTest
@@ -212,7 +212,7 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
     public void testDefaultEncryptionOptions() throws Exception {
         setupTestAccountAndSignInToSync(CLIENT_ID);
         SyncTestUtil.waitForSyncActive(mContext);
-        SyncCustomizationFragment fragment = startSyncCustomizationFragment();
+        final SyncCustomizationFragment fragment = startSyncCustomizationFragment();
         Preference encryption = getEncryption(fragment);
         clickPreference(encryption);
 
@@ -226,7 +226,7 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
         assertEquals(PassphraseType.CUSTOM_PASSPHRASE, adapter.getType(0));
         assertEquals(PassphraseType.KEYSTORE_PASSPHRASE, adapter.getType(1));
         assertEquals(2, listView.getCount());
-        // Make sure they are both enabled and the correct on is selected.
+        // Make sure they are both enabled and the correct one is selected.
         View customView = listView.getChildAt(0);
         View keystoreView = listView.getChildAt(1);
         assertTrue(customView.isEnabled());
@@ -338,20 +338,13 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
     }
 
     private SyncCustomizationFragment startSyncCustomizationFragment() {
-        SyncCustomizationFragment fragment = new SyncCustomizationFragment();
-        Bundle args = new Bundle();
-        args.putString(SyncCustomizationFragment.ARGUMENT_ACCOUNT,
-                SyncTestUtil.DEFAULT_TEST_ACCOUNT);
-        fragment.setArguments(args);
-        FragmentTransaction transaction = mActivity.getFragmentManager().beginTransaction();
-        transaction.add(R.id.content_container, fragment, TAG);
-        transaction.commit();
+        mPreferences = startPreferences(SyncCustomizationFragment.class.getName());
         getInstrumentation().waitForIdleSync();
-        return fragment;
+        return (SyncCustomizationFragment) mPreferences.getFragmentForTest();
     }
 
     private void closeFragment(SyncCustomizationFragment fragment) {
-        FragmentTransaction transaction = mActivity.getFragmentManager().beginTransaction();
+        FragmentTransaction transaction = mPreferences.getFragmentManager().beginTransaction();
         transaction.remove(fragment);
         transaction.commit();
         getInstrumentation().waitForIdleSync();
@@ -388,14 +381,16 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
                 SyncCustomizationFragment.PREFERENCE_SYNC_MANAGE_DATA);
     }
 
-    private PassphraseTypeDialogFragment getPassphraseTypeDialogFragment() {
-        return (PassphraseTypeDialogFragment) mActivity.getFragmentManager()
-                .findFragmentByTag(SyncCustomizationFragment.FRAGMENT_PASSPHRASE_TYPE);
+    private PassphraseTypeDialogFragment getPassphraseTypeDialogFragment()
+            throws InterruptedException {
+        return ActivityUtils.<PassphraseTypeDialogFragment>waitForFragment(mPreferences,
+                SyncCustomizationFragment.FRAGMENT_PASSPHRASE_TYPE);
     }
 
-    private PassphraseCreationDialogFragment getPassphraseCreationDialogFragment() {
-        return (PassphraseCreationDialogFragment) mActivity.getFragmentManager()
-                .findFragmentByTag(SyncCustomizationFragment.FRAGMENT_CUSTOM_PASSPHRASE);
+    private PassphraseCreationDialogFragment getPassphraseCreationDialogFragment()
+            throws InterruptedException {
+        return ActivityUtils.<PassphraseCreationDialogFragment>waitForFragment(mPreferences,
+                SyncCustomizationFragment.FRAGMENT_CUSTOM_PASSPHRASE);
     }
 
     private void assertDefaultSyncOnState(SyncCustomizationFragment fragment) {