Added Signin Parameters

chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java b/chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java
index f53a496771d03d9a5ddde2ae21f29d4790c6e9a7..07540e81c79cf5ed8886f5c78c5a4cff71818eba 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java
@@ -9,6 +9,7 @@ import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.DisabledTest;
+import org.chromium.base.test.util.EnormousTest;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.sync.signin.ChromeSigninController;
 
@@ -28,7 +29,7 @@ public class ChromeSigninUtilsTest extends InstrumentationTestCase {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        mSigninUtil = new ChromeSigninUtils(this);
+        mSigninUtil = new ChromeSigninUtils(getInstrumentation());
         mSigninController = ChromeSigninController.get(getInstrumentation().getTargetContext());
         mSigninController.clearSignedInUser();
         mSigninUtil.removeAllFakeAccountsFromOs();
@@ -75,6 +76,7 @@ public class ChromeSigninUtilsTest extends InstrumentationTestCase {
 
     // https://crbug.com/517849
     @FlakyTest
+    @EnormousTest
     @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
     public void testIsSignedInOnGoogleOS() {
         mSigninUtil.addGoogleAccountToOs(GOOGLE_ACCOUNT_USERNAME, GOOGLE_ACCOUNT_PASSWORD,
@@ -103,6 +105,7 @@ public class ChromeSigninUtilsTest extends InstrumentationTestCase {
 
     // https://crbug.com/517849
     @FlakyTest
+    @EnormousTest
     @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
     public void testIsSignedInOnAppAndGoogleOS() {
         mSigninUtil.addAccountToApp(FAKE_ACCOUNT_USERNAME);
@@ -118,6 +121,7 @@ public class ChromeSigninUtilsTest extends InstrumentationTestCase {
 
     // https://crbug.com/517849
     @FlakyTest
+    @EnormousTest
     @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
     public void testIsSignedInOnFakeOSandGoogleOS() {
         mSigninUtil.addFakeAccountToOs(FAKE_ACCOUNT_USERNAME, FAKE_ACCOUNT_PASSWORD);
@@ -133,6 +137,7 @@ public class ChromeSigninUtilsTest extends InstrumentationTestCase {
 
     // https://crbug.com/517849
     @FlakyTest
+    @EnormousTest
     @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
     public void testIsSignedInOnAppAndFakeOSandGoogleOS() {
         mSigninUtil.addAccountToApp(FAKE_ACCOUNT_USERNAME);