Rename chrome/android/javatests to javatests_shell.

chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
deleted file mode 100644
index c80ffd7d01f9c863a68ada706902d605e2d4fbae..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.signin;
-
-import android.accounts.Account;
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import org.chromium.base.test.util.AdvancedMockContext;
-import org.chromium.base.test.util.Feature;
-import org.chromium.sync.signin.AccountManagerHelper;
-import org.chromium.sync.test.util.AccountHolder;
-import org.chromium.sync.test.util.MockAccountManager;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-public class OAuth2TokenServiceTest extends InstrumentationTestCase {
-
-    private AdvancedMockContext mContext;
-    private MockAccountManager mAccountManager;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Mock out the account manager on the device.
-        mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
-        mAccountManager = new MockAccountManager(mContext, getInstrumentation().getContext());
-        AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
-    public void testGetAccountsNoAccountsRegistered() {
-        String[] accounts = OAuth2TokenService.getAccounts(mContext);
-        assertEquals("There should be no accounts registered", 0, accounts.length);
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
-    public void testGetAccountsOneAccountRegistered() {
-        Account account1 = AccountManagerHelper.createAccountFromName("foo@gmail.com");
-        AccountHolder accountHolder1 = AccountHolder.create().account(account1).build();
-        mAccountManager.addAccountHolderExplicitly(accountHolder1);
-
-        String[] sysAccounts = OAuth2TokenService.getSystemAccounts(mContext);
-        assertEquals("There should be one registered account", 1, sysAccounts.length);
-        assertEquals("The account should be " + account1, account1.name, sysAccounts[0]);
-
-        String[] accounts = OAuth2TokenService.getAccounts(mContext);
-        assertEquals("There should be zero registered account", 0, accounts.length);
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
-    public void testGetAccountsTwoAccountsRegistered() {
-        Account account1 = AccountManagerHelper.createAccountFromName("foo@gmail.com");
-        AccountHolder accountHolder1 = AccountHolder.create().account(account1).build();
-        mAccountManager.addAccountHolderExplicitly(accountHolder1);
-        Account account2 = AccountManagerHelper.createAccountFromName("bar@gmail.com");
-        AccountHolder accountHolder2 = AccountHolder.create().account(account2).build();
-        mAccountManager.addAccountHolderExplicitly(accountHolder2);
-
-        String[] sysAccounts = OAuth2TokenService.getSystemAccounts(mContext);
-        assertEquals("There should be one registered account", 2, sysAccounts.length);
-        assertTrue("The list should contain " + account1,
-                Arrays.asList(sysAccounts).contains(account1.name));
-        assertTrue("The list should contain " + account2,
-                Arrays.asList(sysAccounts).contains(account2.name));
-
-        String[] accounts = OAuth2TokenService.getAccounts(mContext);
-        assertEquals("There should be zero registered account", 0, accounts.length);
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
-    public void testGetOAuth2AccessTokenWithTimeoutOnSuccess() {
-        String authToken = "someToken";
-        // Auth token should be successfully received.
-        runTestOfGetOAuth2AccessTokenWithTimeout(authToken);
-    }
-
-    @SmallTest
-    @Feature({"Sync"})
-    public void testGetOAuth2AccessTokenWithTimeoutOnError() {
-        String authToken = null;
-        // Should not crash when auth token is null.
-        runTestOfGetOAuth2AccessTokenWithTimeout(authToken);
-    }
-
-    private void runTestOfGetOAuth2AccessTokenWithTimeout(String expectedToken) {
-        String scope = "http://example.com/scope";
-        Account account = AccountManagerHelper.createAccountFromName("test@gmail.com");
-        String oauth2Scope = "oauth2:" + scope;
-
-        // Add an account with given auth token for the given scope, already accepted auth popup.
-        AccountHolder accountHolder =
-                AccountHolder.create()
-                        .account(account)
-                        .hasBeenAccepted(oauth2Scope, true)
-                        .authToken(oauth2Scope, expectedToken).build();
-        mAccountManager.addAccountHolderExplicitly(accountHolder);
-
-        String accessToken =
-                OAuth2TokenService.getOAuth2AccessTokenWithTimeout(
-                        mContext, null, account, scope, 5, TimeUnit.SECONDS);
-        assertEquals(expectedToken, accessToken);
-    }
-}