Reland "Reland "[CCA] Run CCA as SWA by default""

This reverts commit c946338b.

Reason for revert: Reland after fixing browser tests

Original change's description:
> Revert "Reland "[CCA] Run CCA as SWA by default""
>
> This reverts commit 074c395f.
>
> Reason for revert:
>
> This patch landed in https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/21376, where three ~related `browser_test` items began failing consistently:
>
> * SystemFeaturesPolicyTest.DisableCameraAfterInstall
> * SystemFeaturesPolicyTest.DisableCameraBeforeInstall
> * ExtensionPolicyTest.ExtensionInstallBlocklistComponentApps
>
> These failures are really verbose, but it looks like the core is:
>
> ```
> ../../chrome/browser/policy/extension_policy_browsertest.cc:401: Failure
> Value of: registry->enabled_extensions().GetByID(extension_misc::kCameraAppId)
>   Actual: false
> Expected: true
> ```
>
>
>
> Original change's description:
> > Reland "[CCA] Run CCA as SWA by default"
> >
> > This reverts commit 5dec0310.
> >
> > Reason for revert: LKGM update: crbug.com/1148527
> >
> > Original change's description:
> > > Revert "[CCA] Run CCA as SWA by default"
> > >
> > > This reverts commit 46b6fd15.
> > >
> > > Reason for revert:
> > >
> > > camera.CCAUISmoke.fake is failing on chromeos-eve-chrome and camera.CCAUI* is listed as test coverage for this CL, so I am speculating that it is the cause. See:
> > > https://ci.chromium.org/p/chrome/builders/ci/chromeos-eve-chrome/11136
> > >
> > > Original change's description:
> > > > [CCA] Run CCA as SWA by default
> > > >
> > > > Bug: b/172345161
> > > > Test: tast run [DUT] camera.CCAUI*
> > > > Change-Id: I10484c9263f3e4c560028aef272cd3db88c47b31
> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2509834
> > > > Commit-Queue: Wei Lee <wtlee@chromium.org>
> > > > Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> > > > Auto-Submit: Wei Lee <wtlee@chromium.org>
> > > > Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> > > > Cr-Commit-Position: refs/heads/master@{#825657}
> > >
> > > TBR=ortuno@chromium.org,wtlee@chromium.org
> > >
> > > Change-Id: I5464fbcd7f1a03cd157122ad66c6ee13ad111630
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: b/172345161
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529360
> > > Reviewed-by: Henrik Boström <hbos@chromium.org>
> > > Commit-Queue: Henrik Boström <hbos@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#825818}
> >
> > TBR=hbos@chromium.org,ortuno@chromium.org,wtlee@chromium.org
> >
> > Bug: b/172345161
> > Change-Id: Ie6d18656a2b247d8eec260319594e7355337c5af
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2547645
> > Reviewed-by: Wei Lee <wtlee@chromium.org>
> > Reviewed-by: Shik Chen <shik@chromium.org>
> > Commit-Queue: Wei Lee <wtlee@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#829079}
>
> TBR=shik@chromium.org,hbos@chromium.org,ortuno@chromium.org,wtlee@chromium.org
>
> Change-Id: I31ad4e34332a5c54a0a4bd2c2f98dfe7e6544016
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: b/172345161
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2549842
> Reviewed-by: Mike West <mkwst@chromium.org>
> Commit-Queue: Mike West <mkwst@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#829154}

TBR=shik@chromium.org,hbos@chromium.org,ortuno@chromium.org,mkwst@chromium.org,wtlee@chromium.org

# Not skipping CQ checks because this is a reland.

Bug: b/172345161
Change-Id: I752d3919a2e7de9a43c2e8271b7f8e83509db84f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2549203Reviewed-by: Wei Lee <wtlee@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829221}

chrome/browser/policy/extension_policy_browsertest.cc

@@ -74,6 +74,7 @@
 #include "chrome/browser/chromeos/web_applications/default_web_app_ids.h"
 #include "chrome/browser/extensions/updater/local_extension_cache.h"
 #include "chrome/browser/web_applications/components/externally_installed_web_app_prefs.h"
+#include "chromeos/constants/chromeos_features.h"
 #include "chromeos/constants/chromeos_switches.h"
 #endif
 
@@ -172,6 +173,14 @@ void RegisterURLReplacingHandler(net::EmbeddedTestServer* test_server,
 }
 
 class ExtensionPolicyTest : public PolicyTest {
+ public:
+  ExtensionPolicyTest() {
+#if defined(OS_CHROMEOS)
+    scoped_feature_list_.InitAndDisableFeature(
+        chromeos::features::kCameraSystemWebApp);
+#endif  // defined(OS_CHROMEOS)
+  }
+
  protected:
   void SetUp() override {
     // Set default verification mode for content verifier to be enabled.
@@ -375,6 +384,8 @@ class ExtensionPolicyTest : public PolicyTest {
       skip_scheduled_extension_checks_;
 
  private:
+  base::test::ScopedFeatureList scoped_feature_list_;
+
   web_app::ScopedOsHooksSuppress os_hooks_suppress_;
 };
 

chrome/browser/policy/system_features_policy_browsertest.cc

@@ -14,6 +14,7 @@
 #include "chrome/common/webui_url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "chromeos/constants/chromeos_features.h"
 #include "components/policy/core/common/policy_pref_names.h"
 #include "components/policy/policy_constants.h"
 #include "components/strings/grit/components_strings.h"
@@ -26,6 +27,12 @@
 namespace policy {
 
 class SystemFeaturesPolicyTest : public PolicyTest {
+ public:
+  SystemFeaturesPolicyTest() {
+    scoped_feature_list_.InitAndDisableFeature(
+        chromeos::features::kCameraSystemWebApp);
+  }
+
  protected:
   base::string16 GetWebUITitle(const GURL& url) {
     content::WebContents* web_contents =
@@ -35,6 +42,9 @@ class SystemFeaturesPolicyTest : public PolicyTest {
     EXPECT_TRUE(content::WaitForLoadStop(web_contents));
     return web_contents->GetTitle();
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(SystemFeaturesPolicyTest, DisableCameraBeforeInstall) {

chromeos/constants/chromeos_features.cc

@@ -157,7 +157,7 @@ const base::Feature kBluetoothPhoneFilter{"BluetoothPhoneFilter",
 
 // Enable or disables running the Camera App as a System Web App.
 const base::Feature kCameraSystemWebApp{"CameraSystemWebApp",
-                                        base::FEATURE_DISABLED_BY_DEFAULT};
+                                        base::FEATURE_ENABLED_BY_DEFAULT};
 
 // If enabled, will use the CDM in the Chrome OS daemon rather than loading the
 // CDM using the library CDM interface.