GitLab

getDataDir() should be replaced with getFileDir()

This is a reland of 6cd69069

Original change's description:
> Revert "Persist cookies for profiles with non-null path"
>
> This reverts commit 6cd69069.
>
> Reason for revert: broke weblayer instrumentation tests, see https://ci.chromium.org/p/chromium/builders/ci/Mojo%20Android/20184?blamelist=1#blamelist-tab
>
> Original change's description:
> > Persist cookies for profiles with non-null path
> >
> > Currently the cookies are not persisted because the default
> > implementation of ContentBrowserClient::CreateNetworkContext doesn't
> > specify cookie_path parameter. In this CL CreateNetworkContext is
> > overridden in WebLayer implementation.
> >
> > Bug: 1014048
> > Change-Id: I1b7a307a64cd836eb5c4a45817412b997b89f1f5
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862677
> > Commit-Queue: Pavel Shmakov <pshmakov@chromium.org>
> > Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> > Reviewed-by: Bo <boliu@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#706390}
>
> TBR=jam@chromium.org,boliu@chromium.org,pshmakov@chromium.org
>
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1014048
> Change-Id: I7b302c7ea8618acd1c578b14ac9c8ed894744cca
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865130
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: John Abd-El-Malek <jam@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#706638}

TBR=jam@chromium.org,boliu@chromium.org,pshmakov@chromium.org

Change-Id: I4848f94a9531b2eda78c593f7cabeb5a68a05dae
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1014048
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865323
Commit-Queue: Pavel Shmakov <pshmakov@chromium.org>
Reviewed-by: Pavel Shmakov <pshmakov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706864}