From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 17 Mar 2019 19:09:00 +0100
Subject: Enable SPPI for devices with enough memory

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
 chrome/common/chrome_features.cc      | 8 ++------
 components/site_isolation/features.cc | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -1045,12 +1045,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt,
 // TODO(alexmos): Move this and the other site isolation features below to
 // browser_features, as they are only used on the browser side.
 BASE_FEATURE(kSitePerProcess,
-             "SitePerProcess",
-#if BUILDFLAG(IS_ANDROID)
-             base::FEATURE_DISABLED_BY_DEFAULT
-#else
-             base::FEATURE_ENABLED_BY_DEFAULT
-#endif
+             "SitePerProcess",                  // enabled by default
+             base::FEATURE_ENABLED_BY_DEFAULT   // in Bromite
 );
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/components/site_isolation/features.cc b/components/site_isolation/features.cc
--- a/components/site_isolation/features.cc
+++ b/components/site_isolation/features.cc
@@ -64,8 +64,8 @@ BASE_FEATURE(kSiteIsolationForOAuthSites,
 // kSitePerProcess won't be checked at all, and field trials won't activate
 // either the control or the experiment group.
 BASE_FEATURE(kSiteIsolationMemoryThresholds,
-             "SiteIsolationMemoryThresholds",
-             base::FEATURE_DISABLED_BY_DEFAULT);
+             "SiteIsolationMemoryThresholds",     // must be enabled
+             base::FEATURE_ENABLED_BY_DEFAULT);   // in Bromite
 const char kStrictSiteIsolationMemoryThresholdParamName[] =
     "strict_site_isolation_threshold_mb";
 const char kPartialSiteIsolationMemoryThresholdParamName[] =
--
2.25.1
