Allow web app manifests to update display to any value

This CL removes the restriction that a web app's manifest display mode
must be one of "standalone", "fullscreen" or "minimal-ui" in order to
participate in manifest updating.

Bug: 1095860
Change-Id: I48241e339c442f8fba341adb85012231b53391f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352457Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797972}

chrome/browser/web_applications/manifest_update_manager_browsertest.cc

@@ -775,7 +775,7 @@ IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTest,
 }
 
 IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTest,
-                       CheckIgnoresDisplayBrowserChange) {
+                       CheckFindsDisplayBrowserChange) {
   constexpr char kManifestTemplate[] = R"(
     {
       "name": "Test app name",
@@ -787,14 +787,23 @@ IN_PROC_BROWSER_TEST_P(ManifestUpdateManagerBrowserTest,
   )";
   OverrideManifest(kManifestTemplate, {"standalone", kInstallableIconList});
   AppId app_id = InstallWebApp();
+  GetProvider().registry_controller().SetAppUserDisplayMode(
+      app_id, DisplayMode::kStandalone);
 
   OverrideManifest(kManifestTemplate, {"browser", kInstallableIconList});
   EXPECT_EQ(GetResultAfterPageLoad(GetAppURL(), &app_id),
-            ManifestUpdateResult::kAppNotEligible);
+            ManifestUpdateResult::kAppUpdated);
   histogram_tester_.ExpectBucketCount(kUpdateHistogramName,
-                                      ManifestUpdateResult::kAppNotEligible, 1);
+                                      ManifestUpdateResult::kAppUpdated, 1);
   EXPECT_EQ(GetProvider().registrar().GetAppDisplayMode(app_id),
+            DisplayMode::kBrowser);
+
+  // We don't touch the user's launch preference even if the app display mode
+  // changes. Instead the effective display mode changes.
+  EXPECT_EQ(GetProvider().registrar().GetAppUserDisplayMode(app_id),
             DisplayMode::kStandalone);
+  EXPECT_EQ(GetProvider().registrar().GetAppEffectiveDisplayMode(app_id),
+            DisplayMode::kMinimalUi);
 }
 
 // A dedicated test fixture for DisplayOverride, which is supported

chrome/browser/web_applications/manifest_update_task.cc

@@ -98,6 +98,7 @@ void ManifestUpdateTask::DidFinishLoad(
   InstallableParams params;
   params.valid_primary_icon = true;
   params.valid_manifest = true;
+  params.check_webapp_manifest_display = false;
   InstallableManager::FromWebContents(web_contents())
       ->GetData(params,
                 base::BindOnce(&ManifestUpdateTask::OnDidGetInstallableData,