GitLab

Previously, vr_shell_resources.grdp contained a condition that it be
included if enable_vr, but in browser_resources.grd we only included
this part if is_android. This allows vr_common_unittests to build on
linux when enable_vr is true.

We will eventually want to, for tests, use generic assets for the
controller (see crbug.com/743687), but this lets us test on linux
in the interim.

This change also relocates our resources to a more appropriate
location.

Bug: None
Change-Id: Ic17545487555595a867913fa58b74e559b26391d
Reviewed-on: https://chromium-review.googlesource.com/572943
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487190}