Revert "VR: Remove VR Launch Intents flag"

This reverts commit c83231b7.

Reason for revert: Should not have removed flags from enums.xml

Original change's description:
> VR: Remove VR Launch Intents flag
> 
> This flag was really only for development while we weren't sure how to
> handle VR Intents. With Chrome VR browsing already shipped, there's no
> reason not to allow Intents to launch it.
> 
> Change-Id: Ibbc7e5ea41668c073a4a04340ec45bfe40025b0f
> Reviewed-on: https://chromium-review.googlesource.com/959051
> Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#542508}

TBR=yfriedman@chromium.org,mthiesse@chromium.org

Change-Id: I6b92369c483f7f0d8a11290bb9a50f6cfd1ea766
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/958021Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542550}

chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java

@@ -258,6 +258,7 @@ public abstract class ChromeFeatureList {
     public static final String VR_BROWSING_IN_CUSTOM_TAB = "VrBrowsingInCustomTab";
     public static final String VR_BROWSING_NATIVE_ANDROID_UI = "VrBrowsingNativeAndroidUi";
     public static final String VR_ICON_IN_DAYDREAM_HOME = "VrIconInDaydreamHome";
+    public static final String VR_LAUNCH_INTENT = "VrLaunchIntents";
     public static final String WEB_PAYMENTS = "WebPayments";
     public static final String WEB_PAYMENTS_METHOD_SECTION_ORDER_V2 =
             "WebPaymentsMethodSectionOrderV2";

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

@@ -1070,7 +1070,10 @@ public class VrShellDelegate
                 return;
             }
             instance.onAutopresentIntent();
-        } else if (isVrShellEnabled(instance.mVrSupportLevel)) {
+        } else if (isVrShellEnabled(instance.mVrSupportLevel)
+                && (ChromeFeatureList.isEnabled(ChromeFeatureList.VR_LAUNCH_INTENT)
+                           || ChromeFeatureList.isEnabled(
+                                      ChromeFeatureList.VR_ICON_IN_DAYDREAM_HOME))) {
             if (DEBUG_LOGS) Log.i(TAG, "onNewIntentWithNative: vr");
             instance.onVrIntent();
         } else {

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTransitionTest.java

@@ -148,6 +148,7 @@ public class VrShellTransitionTest {
     @Test
     @Restriction(RESTRICTION_TYPE_DEVICE_DAYDREAM)
     @MediumTest
+    @CommandLineFlags.Add("enable-features=VrLaunchIntents")
     public void testVrIntentStartsVrShell() {
         // Send a VR intent, which will open the link in a CTA.
         String url = VrTestFramework.getHtmlTestFile("test_navigation_2d_page");

chrome/browser/about_flags.cc

@@ -2245,6 +2245,9 @@ const FeatureEntry kFeatureEntries[] = {
     {"vr-icon-in-daydream-home", flag_descriptions::kVrIconInDaydreamHomeName,
      flag_descriptions::kVrIconInDaydreamHomeDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kVrIconInDaydreamHome)},
+    {"vr-launch-intents", flag_descriptions::kVrLaunchIntentsName,
+     flag_descriptions::kVrLaunchIntentsDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(chrome::android::kVrLaunchIntents)},
     {"webvr-autopresent-from-intent",
      flag_descriptions::kWebVrAutopresentFromIntentName,
      flag_descriptions::kWebVrAutopresentFromIntentDescription, kOsAndroid,

chrome/browser/android/chrome_feature_list.cc

@@ -128,6 +128,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &kVrBrowsingInCustomTab,
     &kVrBrowsingNativeAndroidUi,
     &kVrIconInDaydreamHome,
+    &kVrLaunchIntents,
     &payments::features::kWebPaymentsMethodSectionOrderV2,
     &payments::features::kWebPaymentsModifiers,
     &kWebPaymentsSingleAppUiSkip,
@@ -387,6 +388,9 @@ const base::Feature kVrBrowsingNativeAndroidUi{
 const base::Feature kVrIconInDaydreamHome{"VrIconInDaydreamHome",
                                           base::FEATURE_ENABLED_BY_DEFAULT};
 
+const base::Feature kVrLaunchIntents{"VrLaunchIntents",
+                                     base::FEATURE_DISABLED_BY_DEFAULT};
+
 const base::Feature kWebPaymentsSingleAppUiSkip{
     "WebPaymentsSingleAppUiSkip", base::FEATURE_ENABLED_BY_DEFAULT};
 

chrome/browser/android/chrome_feature_list.h

@@ -85,6 +85,7 @@ extern const base::Feature kVrBrowsingFeedback;
 extern const base::Feature kVrBrowsingInCustomTab;
 extern const base::Feature kVrBrowsingNativeAndroidUi;
 extern const base::Feature kVrIconInDaydreamHome;
+extern const base::Feature kVrLaunchIntents;
 extern const base::Feature kWebPaymentsSingleAppUiSkip;
 extern const base::Feature kWebVrAutopresentFromIntent;
 extern const base::Feature kWebVrCardboardSupport;

chrome/browser/flag_descriptions.cc

@@ -2910,6 +2910,10 @@ const char kVrIconInDaydreamHomeName[] = "Chrome icon in Daydream Home";
 const char kVrIconInDaydreamHomeDescription[] =
     "Adds an icon to Daydream Home that allows launching Chrome in VR.";
 
+const char kVrLaunchIntentsName[] = "VR intents";
+const char kVrLaunchIntentsDescription[] =
+    "Allow intents to launch Chrome in VR mode.";
+
 const char kWebVrAutopresentFromIntentName[] =
     "WebVR auto presentation from intents";
 const char kWebVrAutopresentFromIntentDescription[] =

chrome/browser/flag_descriptions.h

@@ -1788,6 +1788,9 @@ extern const char kVrBrowsingInCustomTabDescription[];
 extern const char kVrIconInDaydreamHomeName[];
 extern const char kVrIconInDaydreamHomeDescription[];
 
+extern const char kVrLaunchIntentsName[];
+extern const char kVrLaunchIntentsDescription[];
+
 extern const char kWebVrAutopresentFromIntentName[];
 extern const char kWebVrAutopresentFromIntentDescription[];
 

tools/metrics/histograms/enums.xml

@@ -25619,6 +25619,7 @@ from previous Chrome versions.
   <int value="-2097515669" label="disable-cast"/>
   <int value="-2091404586" label="TabStripKeyboardFocus:enabled"/>
   <int value="-2090484194" label="ContextualSearchUrlActions:disabled"/>
+  <int value="-2083998415" label="VrLaunchIntent:enabled"/>
   <int value="-2083195884" label="enable-firewall-hole-punching"/>
   <int value="-2082462043" label="ViewPasswords:disabled"/>
   <int value="-2082042818"
@@ -25736,6 +25737,7 @@ from previous Chrome versions.
   <int value="-1874141108" label="NewOmniboxAnswerTypes:enabled"/>
   <int value="-1872989945" label="enable-webview-based-signin"/>
   <int value="-1872867546" label="EnumerateAudioDevices:disabled"/>
+  <int value="-1871185948" label="VrLaunchIntents:disabled"/>
   <int value="-1870961970" label="enable-filemanager-mtp"/>
   <int value="-1869845022" label="force-show-update-menu-item"/>
   <int value="-1868978829" label="spurious-power-button-accel-count"/>
@@ -26531,6 +26533,7 @@ from previous Chrome versions.
   <int value="75237697" label="ash-enable-new-overview-ui"/>
   <int value="75747474" label="disable-webview-signin-flow"/>
   <int value="78998551" label="disable-hosted-app-shim-creation"/>
+  <int value="79094339" label="VrLaunchIntents:enabled"/>
   <int value="79503461" label="disable-account-consistency"/>
   <int value="79595680" label="OmniboxTabSwitchSuggestions:enabled"/>
   <int value="83422372"
@@ -26715,6 +26718,7 @@ from previous Chrome versions.
   <int value="595371145" label="OmniboxRichEntitySuggestions:disabled"/>
   <int value="596106994" label="CustomFeedbackUi:enabled"/>
   <int value="598827460" label="enable-roboto-font-ui"/>
+  <int value="598926697" label="VrLaunchIntent:disabled"/>
   <int value="600037637" label="AndroidSigninPromos:enabled"/>
   <int value="602117675" label="NTPBookmarkSuggestions:enabled"/>
   <int value="603326800" label="UsePasswordSeparatedSigninFlow:enabled"/>