diff options
author | yolandyan <yolandyan@google.com> | 2015-10-20 12:02:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 19:03:33 +0000 |
commit | 8684c62ec7738b2a1ef5a15a3c1979a9a71a24c1 (patch) | |
tree | 1460f979da8d82cce9be91cb6f25a55c67739082 /android_webview/tools/PageCycler | |
parent | 6d37a8e422e7e1f1fac5548bb6959f4de2c3782c (diff) | |
download | chromium_src-8684c62ec7738b2a1ef5a15a3c1979a9a71a24c1.zip chromium_src-8684c62ec7738b2a1ef5a15a3c1979a9a71a24c1.tar.gz chromium_src-8684c62ec7738b2a1ef5a15a3c1979a9a71a24c1.tar.bz2 |
Revert of Enable page cycler to use WebViewShellTestRunner (patchset #2 id:20001 of https://codereview.chromium.org/1413663006/ )
Reason for revert:
Replaced with this CL https://codereview.chromium.org/1412083005
Original issue's description:
> Move WebViewLayoutTestRunner.java to WebViewShellTestRunner.java to
> allow both layout tests and page cycler to use this test runner
>
> This is to solve the conflict in the following 2 CLs
> https://codereview.chromium.org/1402833002
> https://codereview.chromium.org/1410023002
>
> Committed: https://crrev.com/d3825fe7fbfe780da6967c026248842d9f39b11d
> Cr-Commit-Position: refs/heads/master@{#354944}
TBR=mikecase@chromium.org,boliu@chromium.org,jbudorick@chromium.org,timvolodine@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1419703002
Cr-Commit-Position: refs/heads/master@{#355123}
Diffstat (limited to 'android_webview/tools/PageCycler')
-rw-r--r-- | android_webview/tools/PageCycler/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/tools/PageCycler/AndroidManifest.xml b/android_webview/tools/PageCycler/AndroidManifest.xml index f96b90c..49fb1e3 100644 --- a/android_webview/tools/PageCycler/AndroidManifest.xml +++ b/android_webview/tools/PageCycler/AndroidManifest.xml @@ -25,7 +25,7 @@ android:exported="true"/> </application> - <instrumentation android:name="org.chromium.webview_shell.WebViewShellTestRunner" + <instrumentation android:name="org.chromium.base.test.BaseInstrumentationTestRunner" android:targetPackage="org.chromium.webview_shell" android:label="Page cycler for org.chromium.webview_shell" /> </manifest> |