[fuchsia] Allow site-per-process to be set via config-data.

Bug: b/171024731, 1140436
Change-Id: I74900eaa038090cb3ec816492d78df261a9f6332
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2479362
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Alex Gough <ajgo@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818869}

fuchsia/engine/browser/web_engine_content_browser_client.cc

@@ -152,6 +152,14 @@ void WebEngineContentBrowserClient::
   }
 }
 
+bool WebEngineContentBrowserClient::ShouldEnableStrictSiteIsolation() {
+  constexpr base::Feature kSitePerProcess{"site-per-process",
+                                          base::FEATURE_ENABLED_BY_DEFAULT};
+  static bool enable_strict_isolation =
+      base::FeatureList::IsEnabled(kSitePerProcess);
+  return enable_strict_isolation;
+}
+
 void WebEngineContentBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line,
     int child_process_id) {

fuchsia/engine/browser/web_engine_content_browser_client.h

@@ -47,6 +47,7 @@ class WebEngineContentBrowserClient : public content::ContentBrowserClient {
       int render_process_id,
       int render_frame_id,
       NonNetworkURLLoaderFactoryMap* factories) final;
+  bool ShouldEnableStrictSiteIsolation() final;
   void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                       int child_process_id) final;
   std::vector<std::unique_ptr<blink::URLLoaderThrottle>>

fuchsia/engine/context_provider_impl.cc

@@ -127,17 +127,6 @@ bool SetContentDirectoriesInCommandLine(
   return true;
 }
 
-base::Value LoadConfig() {
-  const base::Optional<base::Value>& config = cr_fuchsia::LoadPackageConfig();
-  if (!config) {
-    DLOG(WARNING) << "Configuration data not found. Using default "
-                     "WebEngine configuration.";
-    return base::Value(base::Value::Type::DICTIONARY);
-  }
-
-  return config->Clone();
-}
-
 void AppendFeature(base::StringPiece features_flag,
                    base::StringPiece feature_string,
                    base::CommandLine* command_line) {
@@ -297,9 +286,15 @@ void ContextProviderImpl::Create(
   base::CommandLine launch_command = *base::CommandLine::ForCurrentProcess();
   std::vector<zx::channel> devtools_listener_channels;
 
-  base::Value web_engine_config =
-      config_for_test_.is_none() ? LoadConfig() : std::move(config_for_test_);
-
+  // Process command-line settings specified in our package config-data.
+  base::Value web_engine_config;
+  if (config_for_test_.is_none()) {
+    const base::Optional<base::Value>& config = cr_fuchsia::LoadPackageConfig();
+    web_engine_config =
+        config ? config->Clone() : base::Value(base::Value::Type::DICTIONARY);
+  } else {
+    web_engine_config = std::move(config_for_test_);
+  }
   if (!MaybeAddCommandLineArgsFromConfig(web_engine_config, &launch_command)) {
     context_request.Close(ZX_ERR_INTERNAL);
     return;