Read the bare minimum of data from the WebAPK launch intent.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 193 matching lines @@
         String url = "https://www.foo.com/homepage.html";
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_URL, url);
         WebappInfo info = WebappInfo.create(intent);
         assertEquals(ShortcutHelper.getScopeFromUrl(url), info.scopeUri().toString());
     }
 
     @SmallTest
     @Feature({"Webapps", "WebApk"})
     public void testIntentDisplayMode() {
-        {
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(ShortcutHelper.EXTRA_DISPLAY_MODE, WebDisplayMode.MinimalUi);
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(WebDisplayMode.MinimalUi, info.displayMode());
-        }
-        {
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(WebApkConstants.EXTRA_WEBAPK_DISPLAY_MODE, "fullscreen");
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(WebDisplayMode.Fullscreen, info.displayMode());
-        }
-        {
-            // EXTRA_WEBAPK_DISPLAY_MODE takes precedence over EXTRA_DISPLAY_MODE.
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(WebApkConstants.EXTRA_WEBAPK_DISPLAY_MODE, "fullscreen");
-            intent.putExtra(ShortcutHelper.EXTRA_DISPLAY_MODE, WebDisplayMode.MinimalUi);
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(WebDisplayMode.Fullscreen, info.displayMode());
-        }
-        {
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(WebApkConstants.EXTRA_WEBAPK_DISPLAY_MODE, "invalid");
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(WebDisplayMode.Standalone, info.displayMode());
-        }
+        Intent intent = createIntentWithUrlAndId();
+        intent.putExtra(ShortcutHelper.EXTRA_DISPLAY_MODE, WebDisplayMode.MinimalUi);
+        WebappInfo info = WebappInfo.create(intent);
+        assertEquals(WebDisplayMode.MinimalUi, info.displayMode());
     }
 
     @SmallTest
     @Feature({"Webapps", "WebApk"})
     public void testIntentOrientation() {
-        {
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, ScreenOrientationValues.LANDSCAPE);
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(ScreenOrientationValues.LANDSCAPE, info.orientation());
-        }
-        {
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(WebApkConstants.EXTRA_WEBAPK_ORIENTATION, "natural");
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(ScreenOrientationValues.NATURAL, info.orientation());
-        }
-        {
-            // EXTRA_WEBAPK_ORIENTATION takes precedence over EXTRA_ORIENTATION.
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(WebApkConstants.EXTRA_WEBAPK_ORIENTATION, "natural");
-            intent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, ScreenOrientationValues.LANDSCAPE);
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(ScreenOrientationValues.NATURAL, info.orientation());
-        }
-        {
-            Intent intent = createIntentWithUrlAndId();
-            intent.putExtra(WebApkConstants.EXTRA_WEBAPK_ORIENTATION, "invalid");
-            WebappInfo info = WebappInfo.create(intent);
-            assertEquals(ScreenOrientationValues.DEFAULT, info.orientation());
-        }
+        Intent intent = createIntentWithUrlAndId();
+        intent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, ScreenOrientationValues.LANDSCAPE);
+        WebappInfo info = WebappInfo.create(intent);
+        assertEquals(ScreenOrientationValues.LANDSCAPE, info.orientation());
     }
 
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentGeneratedIcon() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "about:blank";
 
@@ skipping 61 matching lines @@
      * Creates intent with url and id. If the url or id are not set WebappInfo#create() returns
      * null.
      */
     private Intent createIntentWithUrlAndId() {
         Intent intent = new Intent();
         intent.putExtra(ShortcutHelper.EXTRA_ID, "web app id");
         intent.putExtra(ShortcutHelper.EXTRA_URL, "about:blank");
         return intent;
     }
 }