Remove Instrumentation Test Runners

Bug: 807251
Change-Id: I49de4e1668fe851ced12fa335e54e5078b81434f
Reviewed-on: https://chromium-review.googlesource.com/887792
Commit-Queue: Yoland Yan <yolandyan@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532996}

android_webview/test/BUILD.gn

@@ -39,7 +39,6 @@ android_apk("webview_instrumentation_apk") {
     "shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java",
     "shell/src/org/chromium/android_webview/shell/AwShellSwitches.java",
     "shell/src/org/chromium/android_webview/shell/DrawGL.java",
-    "shell/src/org/chromium/android_webview/test/AwInstrumentationTestRunner.java",
     "shell/src/org/chromium/android_webview/test/AwTestContainerView.java",
     "shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java",
     "shell/src/org/chromium/android_webview/test/AwJUnit4ClassRunner.java",

android_webview/test/shell/src/org/chromium/android_webview/test/AwInstrumentationTestRunner.java

-// Copyright 2015 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.android_webview.test;
-
-import org.chromium.base.test.BaseChromiumInstrumentationTestRunner;
-import org.chromium.base.test.BaseTestResult;
-import org.chromium.policy.test.annotations.Policies;
-
-/**
- * Instrumentation test runner that allows integrating features defined above base layer
- * for webview testing.
- */
-public class AwInstrumentationTestRunner extends BaseChromiumInstrumentationTestRunner {
-    @Override
-    protected void addTestHooks(BaseTestResult result) {
-        super.addTestHooks(result);
-
-        result.addPreTestHook(Policies.getRegistrationHook());
-    }
-}

content/public/test/android/BUILD.gn

@@ -32,7 +32,6 @@ android_library("content_java_test_support") {
   java_files = [
     "javatests/src/org/chromium/content/browser/test/ChildProcessAllocatorSettings.java",
     "javatests/src/org/chromium/content/browser/test/ChildProcessAllocatorSettingsHook.java",
-    "javatests/src/org/chromium/content/browser/test/ContentInstrumentationTestRunner.java",
     "javatests/src/org/chromium/content/browser/test/ContentJUnit4ClassRunner.java",
     "javatests/src/org/chromium/content/browser/test/NativeLibraryTestRule.java",
     "javatests/src/org/chromium/content/browser/test/util/ClickUtils.java",

content/public/test/android/javatests/src/org/chromium/content/browser/test/ContentInstrumentationTestRunner.java

-// Copyright 2017 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.content.browser.test;
-
-import org.chromium.base.test.BaseChromiumInstrumentationTestRunner;
-import org.chromium.base.test.BaseTestResult;
-
-/**
- * An instrumentation test runner similar to BaseInstrumentationTestRunner but which also registers
- * content specific annotations.
- */
-public class ContentInstrumentationTestRunner extends BaseChromiumInstrumentationTestRunner {
-    @Override
-    protected void addTestHooks(BaseTestResult result) {
-        super.addTestHooks(result);
-        result.addPreTestHook(new ChildProcessAllocatorSettingsHook());
-    }
-}