| Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
 | 
| diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
 | 
| index 02731062d62d7705a6cf866d6caedd9de4171d18..9819a901075488d665321ddcd5b6cae144eae1d7 100644
 | 
| --- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
 | 
| +++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java
 | 
| @@ -11,14 +11,13 @@ import android.widget.ListView;
 | 
|  import org.chromium.base.test.util.Feature;
 | 
|  import org.chromium.base.test.util.FlakyTest;
 | 
|  import org.chromium.chrome.R;
 | 
| -import org.chromium.chrome.browser.ChromeActivity;
 | 
| -import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 | 
| +import org.chromium.chrome.browser.sync.SyncTestBase;
 | 
|  import org.chromium.sync.PassphraseType;
 | 
|  
 | 
|  /**
 | 
|   * Tests to make sure that PassphraseTypeDialogFragment presents the correct options.
 | 
|   */
 | 
| -public class PassphraseTypeDialogFragmentTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 | 
| +public class PassphraseTypeDialogFragmentTest extends SyncTestBase {
 | 
|      private static final String TAG = "PassphraseTypeDialogFragmentTest";
 | 
|  
 | 
|      private static final boolean ENABLED = true;
 | 
| @@ -39,15 +38,6 @@ public class PassphraseTypeDialogFragmentTest extends ChromeActivityTestCaseBase
 | 
|  
 | 
|      private PassphraseTypeDialogFragment mTypeFragment;
 | 
|  
 | 
| -    public PassphraseTypeDialogFragmentTest() {
 | 
| -        super(ChromeActivity.class);
 | 
| -    }
 | 
| -
 | 
| -    @Override
 | 
| -    public void startMainActivity() throws InterruptedException {
 | 
| -        startMainActivityOnBlankPage();
 | 
| -    }
 | 
| -
 | 
|      @SmallTest
 | 
|      @Feature({"Sync"})
 | 
|      public void testKeystoreEncryptionOptions() throws Exception {
 | 
| 
 |