Enable WebVR presentation from Chrome Custom Tab

chrome/android/java/AndroidManifest.xml

Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index a528f07bc9a6239efcf79793098e918a2eeffe01..c75d9c68799a90f71129f91f3c63fcbae7230f60 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -50,6 +50,7 @@ by a child template that "extends" this file.
     <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>

[Ted C, 2017/04/13 20:17:18]

Since we only need this for newer versions of Android, should we use
uses-permission-sdk-m for now?

[mthiesse, 2017/04/13 20:27:21]

Done.

     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
@@ -365,41 +366,7 @@ by a child template that "extends" this file.
             {% block supports_video_persistence %}
             {% endblock %}
             >
-            <!--
-              See the VRChromeTabbedActivity alias below for an explanation of this dummy intent
-              filter. We need to add these filters here as well, or non-presenting webVR pages will
-              trigger a daydream incompatible app message.
-            -->
-            <intent-filter>
-                <action android:name="org.chromium.chrome.browser.dummy.action" />
-                <category android:name="com.google.intent.category.DAYDREAM" />
-                <category android:name="com.google.intent.category.CARDBOARD" />
-            </intent-filter>
         </activity>
-
-        {% if enable_vr == "true" %}
-        <!--
-            TODO(mthiesse): Temporarily skip ChromeLauncherActivity when returning from Daydream
-            DON flow to avoid polluting metrics.
-        -->
-        <activity-alias android:name="org.chromium.chrome.browser.VRChromeTabbedActivity"
-            android:targetActivity="org.chromium.chrome.browser.ChromeTabbedActivity"
-            android:enableVrMode="@string/gvr_vr_mode_component">
-            <!--
-              Daydream api categorizes an activity to three categories: Cardboard only, hybrid
-              or Daydream. It does so by testing if intents can be resolved by the activity
-              that requests it.
-              In Chrome, CTA is the activity that uses Daydream api and we want to be in hybrid
-              category. So add an intent filter that could pass Daydream tests here.
-            -->
-            <intent-filter>
-                <action android:name="org.chromium.chrome.browser.dummy.action" />
-                <category android:name="com.google.intent.category.DAYDREAM" />
-                <category android:name="com.google.intent.category.CARDBOARD" />
-            </intent-filter>
-        </activity-alias>
-        {% endif %}
-
         <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity2"
              android:theme="@style/TabbedModeTheme"
              android:exported="false"