Changes for Chromium for Robolectric 3.2.

Changes for Chromium for Robolectric 3.2.

Rebasing modifications for Robolectric 3.0 onto Robolectric
3.2.2.

Additionally, adding back getContext() to the ContentProvider
shadow as it was used by one of our tests.

BUG=693659
R=yolandyan@chromium.org

Committed: 5244ef6a3a6aada84a7f4f270f253b760019c14c

[mikecase, 2017-02-24 22:35:06]

Added back function removed from ShadowContentProvider to fix test.

[mikecase, 2017-03-01 00:35:51]

Now that Xstream is committed, I just need to commit this and
https://codereview.chromium.org/2710343003 to update Robolectric

[yolandyan, 2017-03-01 00:44:55]

lgtm

[jbudorick, 2017-03-01 02:16:38]

https://codereview.appspot.com/319410043/diff/20001/robolectric-shadows/shado...
File
robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java
(right):

https://codereview.appspot.com/319410043/diff/20001/robolectric-shadows/shado...
robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java:36:
public final Context getContext() {
Was there not a better way to get the Context?

[mikecase, 2017-03-01 03:21:28]

https://codereview.appspot.com/319410043/diff/20001/robolectric-shadows/shado...
File
robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java
(right):

https://codereview.appspot.com/319410043/diff/20001/robolectric-shadows/shado...
robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java:36:
public final Context getContext() {
On 2017/03/01 02:16:38, jbudorick wrote:
> Was there not a better way to get the Context?

Well, this function was in Robolectric 3.0 and is relied on by some of our tests
(3 tests to be exact)

https://github.com/robolectric/robolectric/blob/robolectric-3.0/robolectric-s...

The test calls something that calls getContext(). So at minimum we would have to
disable or refactor the test. I could add a..
# TODO(mikecase): Remove when no tests rely on this,

or something

[mikecase, 2017-03-01 03:25:00]

On 2017/03/01 03:21:28, mikecase wrote:
>
https://codereview.appspot.com/319410043/diff/20001/robolectric-shadows/shado...
> File
>
robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java
> (right):
> 
>
https://codereview.appspot.com/319410043/diff/20001/robolectric-shadows/shado...
>
robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java:36:
> public final Context getContext() {
> On 2017/03/01 02:16:38, jbudorick wrote:
> > Was there not a better way to get the Context?
> 
> Well, this function was in Robolectric 3.0 and is relied on by some of our
tests
> (3 tests to be exact)
> 
>
https://github.com/robolectric/robolectric/blob/robolectric-3.0/robolectric-s...
> 
> The test calls something that calls getContext(). So at minimum we would have
to
> disable or refactor the test. I could add a..
> # TODO(mikecase): Remove when no tests rely on this,
> 
> or something

Also, ContentProvider getContext() is final. So we cant even mock it out. I
think we have to do it through a shadow.

[mikecase, 2017-03-01 18:45:36]

Ok, so here is my plan. Undo my changes here to ShadowContentProvider.java and
commit this.

Then override the ShadowContentProvider.java (MyShadowContentProvider.java or
something) for the one test class that needs the getContext() shadowed.
Then will add the author of that test to the review, verify it works as
expected, and hopefully commit the upgrade of Robolectric in Chromium.

[mikecase, 2017-03-01 18:50:55]

On 2017/03/01 18:45:36, mikecase wrote:
> Ok, so here is my plan. Undo my changes here to ShadowContentProvider.java and
> commit this.
> 
> Then override the ShadowContentProvider.java (MyShadowContentProvider.java or
> something) for the one test class that needs the getContext() shadowed.
> Then will add the author of that test to the review, verify it works as
> expected, and hopefully commit the upgrade of Robolectric in Chromium.

Since I have lgtm from yoland, and this now literally only a rebase of what I
already have commit onto the 3.0-chromium branch. Going to commit now.

[mikecase, 2017-03-01 18:53:02]

Committed patchset #4 (id:60001) manually as
5244ef6a3a6aada84a7f4f270f253b760019c14c (presubmit successful).