GitLab

This reverts commit 381beab3.

Reason for revert: Suspected of breaking browser_tests on Mac. crbug.com/870579

Original change's description:
> chrome: Call SetUpBundleOverrides from ChromeMain.
> 
> It looks like we always need to call SetUpBundleOverrides no matter
> what the process type is, so we can just call it from ChromeMain. This
> will save us from needing to call this function from browser-specific
> code in a later change.
> 
> While here, also remove a dead declaration.
> 
> Bug: 855193
> Change-Id: I449d92ef9c7d80d066d4cfefb3015014bd407cc1
> Reviewed-on: https://chromium-review.googlesource.com/1159335
> Reviewed-by: Robert Sesek <rsesek@chromium.org>
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Commit-Queue: Avi Drissman <avi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#580285}

TBR=avi@chromium.org,pcc@chromium.org,rsesek@chromium.org,mark@chromium.org

Change-Id: I32f905ff8f82306a85fbc9798652b8c99aa46009
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 855193,870579
Reviewed-on: https://chromium-review.googlesource.com/1161722Reviewed-by: Kunihiko Sakamoto <ksakamoto@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580456}