[Fuchsia] Enable the NetworkService by default.

WebEngine appears to work correctly with NetworkService enabled, so
enable it.

Bug: 964161, b/130731732
Change-Id: I0a0566690a08a854553f2a526c4350cb9aa3be9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1613884
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661146}

fuchsia/engine/browser/context_impl_browsertest.cc

@@ -21,6 +21,9 @@
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "services/network/public/cpp/features.h"
+#include "services/network/public/mojom/cookie_manager.mojom.h"
+#include "services/network/public/mojom/network_context.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_constants.h"
@@ -31,12 +34,18 @@ using testing::InvokeWithoutArgs;
 
 namespace {
 
+void OnNetworkServiceCookiesReceived(net::CookieList* output,
+                                     base::OnceClosure on_received_cb,
+                                     const net::CookieList& cookies) {
+  *output = cookies;
+  std::move(on_received_cb).Run();
+}
+
 void OnCookiesReceived(net::CookieList* output,
                        base::OnceClosure on_received_cb,
                        const net::CookieList& cookies,
-                       const net::CookieStatusList& excluded_cookies) {
-  *output = cookies;
-  std::move(on_received_cb).Run();
+                       const net::CookieStatusList& cookie_status) {
+  OnNetworkServiceCookiesReceived(output, std::move(on_received_cb), cookies);
 }
 
 // Defines a suite of tests that exercise browser-level configuration and
@@ -54,22 +63,33 @@ class ContextImplTest : public cr_fuchsia::WebEngineBrowserTest {
 
   // Synchronously gets a list of cookies for this BrowserContext.
   net::CookieList GetCookies() {
-    net::CookieStore* cookie_store =
-        content::BrowserContext::GetDefaultStoragePartition(
-            context_impl()->browser_context_for_test())
-            ->GetURLRequestContext()
-            ->GetURLRequestContext()
-            ->cookie_store();
-
     base::RunLoop run_loop;
     net::CookieList cookies;
-    base::PostTaskWithTraits(
-        FROM_HERE, {content::BrowserThread::IO},
-        base::BindOnce(
-            &net::CookieStore::GetAllCookiesAsync,
-            base::Unretained(cookie_store),
-            base::BindOnce(&OnCookiesReceived, base::Unretained(&cookies),
-                           run_loop.QuitClosure())));
+    network::mojom::CookieManagerPtr cookie_manager;
+    if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+      content::BrowserContext::GetDefaultStoragePartition(
+          context_impl()->browser_context_for_test())
+          ->GetNetworkContext()
+          ->GetCookieManager(mojo::MakeRequest(&cookie_manager));
+      cookie_manager->GetAllCookies(
+          base::BindOnce(&OnNetworkServiceCookiesReceived,
+                         base::Unretained(&cookies), run_loop.QuitClosure()));
+    } else {
+      net::CookieStore* cookie_store =
+          content::BrowserContext::GetDefaultStoragePartition(
+              context_impl()->browser_context_for_test())
+              ->GetURLRequestContext()
+              ->GetURLRequestContext()
+              ->cookie_store();
+      base::PostTaskWithTraits(
+          FROM_HERE, {content::BrowserThread::IO},
+          base::BindOnce(
+              &net::CookieStore::GetAllCookiesAsync,
+              base::Unretained(cookie_store),
+              base::BindOnce(&OnCookiesReceived, base::Unretained(&cookies),
+                             run_loop.QuitClosure())));
+    }
+
     run_loop.Run();
     return cookies;
   }

services/network/public/cpp/features.cc

@@ -19,14 +19,13 @@ const base::Feature kNetworkErrorLogging{"NetworkErrorLogging",
 // Enables the network service.
 const base::Feature kNetworkService {
   "NetworkService",
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \
     (defined(OS_LINUX) && !defined(IS_CHROMECAST))
       base::FEATURE_ENABLED_BY_DEFAULT
-};
 #else
       base::FEATURE_DISABLED_BY_DEFAULT
-};
 #endif
+};
 
 // Out of Blink CORS
 const base::Feature kOutOfBlinkCors{"OutOfBlinkCors",

services/service_manager/sandbox/BUILD.gn

@@ -111,6 +111,8 @@ component("sandbox") {
       "//third_party/fuchsia-sdk/sdk:fonts",
       "//third_party/fuchsia-sdk/sdk:logger",
       "//third_party/fuchsia-sdk/sdk:mediacodec",
+      "//third_party/fuchsia-sdk/sdk:net",
+      "//third_party/fuchsia-sdk/sdk:netstack",
       "//third_party/fuchsia-sdk/sdk:sysmem",
       "//third_party/fuchsia-sdk/sdk:ui_scenic",
     ]

services/service_manager/sandbox/fuchsia/sandbox_policy_fuchsia.cc

@@ -11,6 +11,8 @@
 #include <fuchsia/fonts/cpp/fidl.h>
 #include <fuchsia/logger/cpp/fidl.h>
 #include <fuchsia/mediacodec/cpp/fidl.h>
+#include <fuchsia/net/cpp/fidl.h>
+#include <fuchsia/netstack/cpp/fidl.h>
 #include <fuchsia/sysmem/cpp/fidl.h>
 #include <fuchsia/ui/scenic/cpp/fidl.h>
 #include <memory>
@@ -61,20 +63,12 @@ constexpr SandboxConfig kSandboxConfigs[] = {
         // Services directory is passed by calling SetServiceDirectory().
         base::span<const char* const>(),
 
-        // kCloneJob: context process needs to be able to spawn child processes.
-        // kProvideVulkanResources: Vulkan access is required to delegate to the
-        // GPU process. kProvideSslConfig: Context process is responsible for
-        // cert verification.
+        // kCloneJob: Allow Contexts to launch child processes.
+        // kProvideVulkanResources: Context delegates this to the GPU process.
+        // kProvideSslConfig: Context delegates this to the NetworkService.
         kCloneJob | kProvideVulkanResources | kProvideSslConfig |
             kUseServiceDirectoryOverride,
     },
-    {
-        SANDBOX_TYPE_RENDERER,
-        base::make_span(
-            (const char* const[]){fuchsia::fonts::Provider::Name_,
-                                  fuchsia::mediacodec::CodecFactory::Name_}),
-        0,
-    },
     {
         SANDBOX_TYPE_GPU,
         base::make_span((const char* const[]){
@@ -82,6 +76,20 @@ constexpr SandboxConfig kSandboxConfigs[] = {
             fuchsia::sysmem::Allocator::Name_, "fuchsia.vulkan.loader.Loader"}),
         kProvideVulkanResources,
     },
+    {
+        SANDBOX_TYPE_NETWORK,
+        base::make_span(
+            (const char* const[]){fuchsia::net::SocketProvider::Name_,
+                                  fuchsia::netstack::Netstack::Name_}),
+        kProvideSslConfig,
+    },
+    {
+        SANDBOX_TYPE_RENDERER,
+        base::make_span(
+            (const char* const[]){fuchsia::fonts::Provider::Name_,
+                                  fuchsia::mediacodec::CodecFactory::Name_}),
+        0,
+    },
 };
 
 constexpr SandboxConfig kDefaultConfig = {