Cleanup MockGrantCredentialsPermissionActivity after removing downstream references.

Cleanup following https://codereview.chromium.org/1440363002/

BUG=555495

Review URL: https://codereview.chromium.org/1493783002

Cr-Commit-Position: refs/heads/master@{#362794}

2 files changed, 0 insertions, 35 deletions

diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
index f28f21d..2b6e6a1 100644
--- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
+++ b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
@@ -4,15 +4,12 @@
 
 package org.chromium.sync.test.util;
 
-import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.os.Handler;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
@@ -37,9 +34,6 @@ import java.util.concurrent.TimeUnit;
  * Currently, this implementation supports adding and removing accounts, handling credentials
  * (including confirming them), and handling of dummy auth tokens.
  *
- * If you want the MockAccountManager to popup an activity for granting/denying access to an
- * authtokentype for a given account, use prepareGrantAppPermission(...).
- *
  * If you want to auto-approve a given authtokentype, use addAccountHolderExplicitly(...) with
  * an AccountHolder you have built with hasBeenAccepted("yourAuthTokenType", true).
  *
@@ -50,21 +44,10 @@ public class MockAccountManager implements AccountManagerDelegate {
 
     private static final String TAG = "MockAccountManager";
 
-    private static final long WAIT_TIME_FOR_GRANT_BROADCAST_MS = scaleTimeout(20000);
-
-    static final String MUTEX_WAIT_ACTION =
-            "org.chromium.sync.test.util.MockAccountManager.MUTEX_WAIT_ACTION";
-
     protected final Context mContext;
 
-    private final Context mTestContext;
-
     private final Set<AccountHolder> mAccounts;
 
-    private final Handler mMainHandler;
-
-    private final SingleThreadedExecutor mExecutor;
-
     // Tracks the number of in-progress getAccountsByType() tasks so that tests can wait for
     // their completion.
     private final ZeroCounter mGetAccountsTaskCounter;
@@ -72,11 +55,6 @@ public class MockAccountManager implements AccountManagerDelegate {
     @VisibleForTesting
     public MockAccountManager(Context context, Context testContext, Account... accounts) {
         mContext = context;
-        // The manifest that is backing testContext needs to provide the
-        // MockGrantCredentialsPermissionActivity.
-        mTestContext = testContext;
-        mMainHandler = new Handler(mContext.getMainLooper());
-        mExecutor = new SingleThreadedExecutor();
         mGetAccountsTaskCounter = new ZeroCounter();
         mAccounts = new HashSet<AccountHolder>();
         if (accounts != null) {
diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockGrantCredentialsPermissionActivity.java b/sync/test/android/javatests/src/org/chromium/sync/test/util/MockGrantCredentialsPermissionActivity.java
deleted file mode 100644
index bbc4385..0000000
--- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockGrantCredentialsPermissionActivity.java
+++ /dev/null
@@ -1,13 +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.sync.test.util;
-
-import android.app.Activity;
-
-/**
- *  TODO(knn): Remove this after downstream references have been removed.
- */
-public class MockGrantCredentialsPermissionActivity extends Activity {
-}