commit 055dc2c6367c88a3dc058889a60bf090bf8db05b
author Xi Han <hanxi@chromium.org> Wed May 22 21:03:20 2019
committer Commit Bot <commit-bot@chromium.org> Wed May 22 21:03:20 2019
tree a0e3e407ebbebe27ba65a279b91aca5bd7f0bc2e
parent de0f01d6e02d5d8a9ae2d15b203b98523a92747a

Revert "Reland "Android: Never persist SharedPreferences in instrumentation tests.""

This reverts commit 6ea6519b08759b9a6bc496edaeba8625311777d0.

Reason for revert: crbug.com/966187

Original change's description:
> Reland "Android: Never persist SharedPreferences in instrumentation tests."
> 
> This reverts commit 8f92efd247a0bc07f744b52f2692a7038807467d.
> 
> Reason for revert: Fixed both tests not using proper instrumentation:
> https://chromium-review.googlesource.com/c/chromium/src/+/1625014
> 
> Original change's description:
> > Revert "Android: Never persist SharedPreferences in instrumentation tests."
> > 
> > This reverts commit bc473eb4dd7441ce842019a40321ccdac5904f7b.
> > 
> > Reason for revert: crbug.com/965612.
> > 
> > 
> > Original change's description:
> > > Android: Never persist SharedPreferences in instrumentation tests.
> > > 
> > > I'm hoping that this will reduce test flakes by removing a source of
> > > tests being able to change the behavior of other tests.
> > > 
> > > * Uses InMemorySharedPreferences instead.
> > > * Asserts after each test that no SharedPreferences circumvented the
> > > fakes (which is possible by using non-application Context objects
> > > * Combines LifetimeAssertRule and CommitSharedPreferencesTestRule into a
> > > single BaseJUnit4TestRule.
> > > 
> > > TBR=agrieve # Trivial change in InvalidationPreferencesTest.java
> > > 
> > > Bug: 441859
> > > Change-Id: I068537c5fe448131463803cf90ca842c88bdc323
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1588658
> > > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > > Reviewed-by: John Budorick <jbudorick@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#661751}
> > 
> > TBR=agrieve@chromium.org,jbudorick@chromium.org,yliuyliu@google.com
> > 
> > Change-Id: I06586c9c82f1bcca76265a1da362fa7f6da0de2e
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 441859
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1622910
> > Reviewed-by: Xi Han <hanxi@chromium.org>
> > Commit-Queue: Xi Han <hanxi@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#661844}
> 
> TBR=hanxi@chromium.org,agrieve@chromium.org,jbudorick@chromium.org,yliuyliu@google.com
> 
> Bug: 441859
> Change-Id: I4571137cb64685a3f7fc06ac00702d0536e62f01
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1625019
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#662250}

TBR=hanxi@chromium.org,agrieve@chromium.org,jbudorick@chromium.org,yliuyliu@google.com

Change-Id: Ia0afda4d3341ea989dfe249e930ee2b8883a0ece
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 441859
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1626308
Reviewed-by: Xi Han <hanxi@chromium.org>
Commit-Queue: Xi Han <hanxi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662335}