Android: Move VR-specific styles into res_vr/

This allows removing the android lint suppression for them.

Bug: 806060
Change-Id: Ibdfd421f4a1714c64fecb0f2c1349a7af033ef91
Reviewed-on: https://chromium-review.googlesource.com/900047Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534639}

build/android/lint/suppressions.xml

@@ -358,9 +358,6 @@ Still reading?
     <!-- 2 resource sets used by clank widgets for each channel -->
     <ignore regexp="The resource `R.string.bookmark_widget_title.*` appears to be unused"/>
     <ignore regexp="The resource `R.string.search_widget_title.*` appears to be unused"/>
-    <!-- 2 resources are only used when vr is enabled through a build flag -->
-    <ignore regexp="The resource `R.style.VrSupportThemeLauncher` appears to be unused"/>
-    <ignore regexp="The resource `R.style.VrSupportTheme` appears to be unused"/>
     <!-- Endnote: Please specify number of suppressions when adding more -->
   </issue>
   <issue id="UseCompoundDrawables">

chrome/android/java/res/values-v17/styles.xml

@@ -58,22 +58,6 @@
     <style name="TabbedModeFirstRunTheme" parent="TabbedModeTheme">
     </style>
 
-    <!-- The theme to use when starting Chrome in VR mode.-->
-    <style name="VrSupportTheme" parent="MainTheme">
-       <!-- Android shows a preview window to give the user immediate feedback that the
-            app launched. The default behavior with this preview window is to show system
-            UI (e.g. navigation bars), which looks jarring if the user already has their
-            headset on. We disable the preview window feature when starting Chrome in VR
-            mode.
-       -->
-      <item name="android:windowDisablePreview">true</item>
-      <item name="android:windowBackground">@android:color/black</item>
-    </style>
-    <style name="VrSupportThemeLauncher" parent="@android:style/Theme.NoDisplay">
-      <item name="android:windowDisablePreview">true</item>
-      <item name="android:windowBackground">@android:color/black</item>
-    </style>
-
     <style name="FullscreenWhiteBase" parent="Theme.AppCompat.Light" >
         <item name="android:windowBackground">@android:color/white</item>
         <item name="android:textColorLink">@color/light_active_color</item>

chrome/android/java/res_vr/values-v17/vr_styles.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- The theme to use when starting Chrome in VR mode.-->
+    <style name="VrSupportTheme" parent="MainTheme">
+       <!-- Android shows a preview window to give the user immediate feedback that the
+            app launched. The default behavior with this preview window is to show system
+            UI (e.g. navigation bars), which looks jarring if the user already has their
+            headset on. We disable the preview window feature when starting Chrome in VR
+            mode.
+       -->
+      <item name="android:windowDisablePreview">true</item>
+      <item name="android:windowBackground">@android:color/black</item>
+    </style>
+    <style name="VrSupportThemeLauncher" parent="@android:style/Theme.NoDisplay">
+      <item name="android:windowDisablePreview">true</item>
+      <item name="android:windowBackground">@android:color/black</item>
+    </style>
+</resources>