GitLab

This reverts commit 4cf59ffa.

This patch appears to break the contentshell_instrumentation_tests on
the chromium.webkit waterfall. I'm not sure what to do about this,
as the .webkit tests appear to be run in a completely different
way than the .linux (main waterfall) tests, but I'm reverting this
for now and we can sort it out later.

TBR=jbudorick@chromium.org, maruel@chromium.org
BUG=400499

> Author: jbudorick <jbudorick@chromium.org>
> Date:   Fri Feb 6 16:43:24 2015 -0800
>
>     [Android] Convert ContentShellTest.apk to isolate.
>
>     We were previously using --test-data to push files from
>     //content/test/data/android/device_files to
>     $EXTERNAL_STORAGE/chrome/test/data/content. Switching to isolate lets
>     us handle all of our instrumentation and gtest data dependencies in the
>     same way. It will also facilitate using isolate to optimize transfers
>     between builders and testers.
>
>     BUG=400499
>     TBR=maruel@chromium.org
>
>     Review URL: https://codereview.chromium.org/878163004
>
>     Cr-Commit-Position: refs/heads/master@{#315148}

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

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