https://crrev.com/c/6599562 refactored the code to support the PRE_
test grouping in gtest. This CL is a followup to keep user data dir
for PRE_ tests in apk-based gtest.

**Note** that PRE_ tests in android_browsertests still don't work
because it uses a different way to setup and clean user data dir,
after the CL https://crrev.com/c/1677591

This CL introduces new intent extra "KeepUserDataDir" in
1. NativeTestInstrumentationTestRunner.
2. NativeTestIntent.

The python code local_device_gtest_run.py sets the extra #1 to true
for a PRE_ test group.

Then NativeTestInstrumentationTestRunner.java consumes this info and
sets the extra #2 for each individual java test shard.

The *BrowserTestActivity.java then read this info, and keep the user
data dir when needed, before running the tests.

This CL also enables NetworkServiceBrowserCacheResetTest in
content_browsertests on android, which contains PRE_ tests

Bug: 40200835
Change-Id: I279b55e39eee05e70f8cab80ffc9d9595cc70376
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6568919
Reviewed-by: Adam Rice <ricea@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1473200}
NOKEYCHECK=True
GitOrigin-RevId: fa6e7b9cd713f3328ace3b15d010eef0207f295e

This reverts commit fa6e7b9cd713f3328ace3b15d010eef0207f295e.

Reason for revert: Suspect for test failures; See http://b/424625656

Bug: 40200835, 424625656
Original change's description:
> Android apk-based Gtest: Keep user data dir for PRE_ tests.
>
> https://crrev.com/c/6599562 refactored the code to support the PRE_
> test grouping in gtest. This CL is a followup to keep user data dir
> for PRE_ tests in apk-based gtest.
>
> **Note** that PRE_ tests in android_browsertests still don't work
> because it uses a different way to setup and clean user data dir,
> after the CL https://crrev.com/c/1677591
>
> This CL introduces new intent extra "KeepUserDataDir" in
> 1. NativeTestInstrumentationTestRunner.
> 2. NativeTestIntent.
>
> The python code local_device_gtest_run.py sets the extra #1 to true
> for a PRE_ test group.
>
> Then NativeTestInstrumentationTestRunner.java consumes this info and
> sets the extra #2 for each individual java test shard.
>
> The *BrowserTestActivity.java then read this info, and keep the user
> data dir when needed, before running the tests.
>
> This CL also enables NetworkServiceBrowserCacheResetTest in
> content_browsertests on android, which contains PRE_ tests
>
> Bug: 40200835
> Change-Id: I279b55e39eee05e70f8cab80ffc9d9595cc70376
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6568919
> Reviewed-by: Adam Rice <ricea@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Haiyang Pan <hypan@google.com>
> Cr-Commit-Position: refs/heads/main@{#1473200}

Bug: 40200835
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I61ad6b412ae64a71d6a96d2963cb100351174fba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6641801
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Neil Coronado <nemco@google.com>
Owners-Override: Neil Coronado <nemco@google.com>
Cr-Commit-Position: refs/heads/main@{#1473278}
NOKEYCHECK=True
GitOrigin-RevId: 9f5be0af69b06f431e037468bc82dee9bc68cf4b

This is a reland of commit fa6e7b9cd713f3328ace3b15d010eef0207f295e

Fixes: Removed content/browser/network_service_browsertest.cc change.
Will land this in a separate CL.

Original change's description:
> Android apk-based Gtest: Keep user data dir for PRE_ tests.
>
> https://crrev.com/c/6599562 refactored the code to support the PRE_
> test grouping in gtest. This CL is a followup to keep user data dir
> for PRE_ tests in apk-based gtest.
>
> **Note** that PRE_ tests in android_browsertests still don't work
> because it uses a different way to setup and clean user data dir,
> after the CL https://crrev.com/c/1677591
>
> This CL introduces new intent extra "KeepUserDataDir" in
> 1. NativeTestInstrumentationTestRunner.
> 2. NativeTestIntent.
>
> The python code local_device_gtest_run.py sets the extra #1 to true
> for a PRE_ test group.
>
> Then NativeTestInstrumentationTestRunner.java consumes this info and
> sets the extra #2 for each individual java test shard.
>
> The *BrowserTestActivity.java then read this info, and keep the user
> data dir when needed, before running the tests.
>
> This CL also enables NetworkServiceBrowserCacheResetTest in
> content_browsertests on android, which contains PRE_ tests
>
> Bug: 40200835
> Change-Id: I279b55e39eee05e70f8cab80ffc9d9595cc70376
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6568919
> Reviewed-by: Adam Rice <ricea@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Haiyang Pan <hypan@google.com>
> Cr-Commit-Position: refs/heads/main@{#1473200}

Bug: 40200835, 424625656
Change-Id: I8036b000518efc4affdb4656f73e60afdb30020e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6643463
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1474455}
NOKEYCHECK=True
GitOrigin-RevId: b4d1a817faefed922a2556e94d1fceea2adef7a1