Revert of Created the dialog offering the user to merge their account data or keep it

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
index 59f78440769b33df215746f19e310c3b9fe911aa..ac740c92d75fd62f6531c9631673d8c859d57b6a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
@@ -4,7 +4,9 @@
 
 package org.chromium.chrome.browser.preferences;
 
+import android.accounts.Account;
 import android.app.Activity;
+import android.app.DialogFragment;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.Intent;
@@ -23,9 +25,14 @@
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.LoadListener;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
+import org.chromium.chrome.browser.signin.SigninManager;
+import org.chromium.chrome.browser.sync.ui.ChooseAccountFragment;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.UiUtils;
+import org.chromium.sync.signin.AccountManagerHelper;
+import org.chromium.sync.test.util.MockAccountManager;
+import org.chromium.sync.test.util.SimpleFuture;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -210,6 +217,50 @@
         GeolocationInfo locationSettings = new GeolocationInfo(url, null, false);
         ContentSetting locationPermission = locationSettings.getContentSetting();
         return locationPermission;
+    }
+
+    /**
+     * Tests that double-clicking on sign-in doesn't show two sign-in prompts.
+     *
+     * This is a regression test for http://crbug.com/515055.
+     */
+    @SmallTest
+    @Feature({"Preferences"})
+    public void testDoubleSignin() throws Exception {
+        // Sets up state so that displayAccountPicker() shows a ChooseAccountFragment.
+        setUpTestAccount();
+        final Preferences prefActivity = startPreferences(getInstrumentation(),
+                MainPreferences.class.getName());
+        final MainPreferences mainPrefs = (MainPreferences) prefActivity.getFragmentForTest();
+
+        DialogFragment fragment1 = displayAccountPicker(mainPrefs);
+        DialogFragment fragment2 = displayAccountPicker(mainPrefs);
+        assertTrue(fragment1 instanceof ChooseAccountFragment);
+        assertNull(fragment2);
+    }
+
+    private DialogFragment displayAccountPicker(final MainPreferences mainPrefs)
+            throws InterruptedException {
+        final SimpleFuture<DialogFragment> result = new SimpleFuture<DialogFragment>();
+        ThreadUtils.runOnUiThread(new Runnable() {
+            public void run() {
+                mainPrefs.displayAccountPicker(result.createCallback());
+            }
+        });
+        return result.get();
+    }
+
+    private void setUpTestAccount() {
+        final Context context = getInstrumentation().getTargetContext();
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                SigninManager.get(context).onFirstRunCheckDone();
+            }
+        });
+        Account account = AccountManagerHelper.createAccountFromName("test@chromium.org");
+        MockAccountManager accountManager = new MockAccountManager(context, context, account);
+        AccountManagerHelper.overrideAccountManagerHelperForTests(context, accountManager);
     }
 
     // TODO(mvanouwerkerk): Write new preference intent tests for notification settings.