Change some ChromeOS unittests to handle the CertVerifierService

The CertVerifier implementations are moving out of the network
service and into the CertVerifierService for sandboxing reasons.

Creators of NetworkContexts need to provide a pipe to a
CertVerifierService in the NetworkContextParams. This CL does that
for some remaining ChromeOS unittests.

The CertVerifierService also requires an IO thread on ChromeOS,
so some unittests switch to using BrowserTaskEnvironment instead
of the other various test::TaskEnvironments.

Bug: 1015134, 1094483
Change-Id: I3fb3097492b3d3a9de7572fbabddd5a041580a0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2515203Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Matthew Denton <mpdenton@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823789}

chrome/browser/chromeos/login/profile_auth_data_unittest.cc

@@ -64,9 +64,12 @@ CreateNetworkContextForDefaultStoragePartition(
     network::NetworkService* network_service,
     content::BrowserContext* browser_context) {
   mojo::PendingRemote<network::mojom::NetworkContext> network_context_remote;
+  auto params = network::mojom::NetworkContextParams::New();
+  params->cert_verifier_params = content::GetCertVerifierParams(
+      network::mojom::CertVerifierCreationParams::New());
   auto network_context = std::make_unique<network::NetworkContext>(
       network_service, network_context_remote.InitWithNewPipeAndPassReceiver(),
-      network::mojom::NetworkContextParams::New());
+      std::move(params));
   content::BrowserContext::GetDefaultStoragePartition(browser_context)
       ->SetNetworkContextForTesting(std::move(network_context_remote));
   return network_context;

chrome/browser/chromeos/net/network_diagnostics/tls_prober_unittest.cc

@@ -15,6 +15,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/net/network_diagnostics/fake_host_resolver.h"
 #include "chrome/browser/chromeos/net/network_diagnostics/fake_network_context.h"
+#include "content/public/browser/network_service_instance.h"
 #include "content/public/test/browser_task_environment.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -292,9 +293,12 @@ class TlsProberWithRealNetworkContextTest : public ::testing::Test {
   void SetUp() override {
     service_ = network::NetworkService::CreateForTesting();
     service_->Bind(network_service_.BindNewPipeAndPassReceiver());
+    auto context_params = network::mojom::NetworkContextParams::New();
+    context_params->cert_verifier_params = content::GetCertVerifierParams(
+        network::mojom::CertVerifierCreationParams::New());
     network_service_->CreateNetworkContext(
         network_context_.BindNewPipeAndPassReceiver(),
-        network::mojom::NetworkContextParams::New());
+        std::move(context_params));
     test_server_ = std::make_unique<net::EmbeddedTestServer>(
         net::EmbeddedTestServer::TYPE_HTTPS);
     net::SSLServerConfig ssl_config;

chrome/browser/chromeos/policy/system_proxy_manager_unittest.cc

@@ -55,9 +55,12 @@ CreateNetworkContextForDefaultStoragePartition(
     network::NetworkService* network_service,
     content::BrowserContext* browser_context) {
   mojo::PendingRemote<network::mojom::NetworkContext> network_context_remote;
+  auto params = network::mojom::NetworkContextParams::New();
+  params->cert_verifier_params = content::GetCertVerifierParams(
+      network::mojom::CertVerifierCreationParams::New());
   auto network_context = std::make_unique<network::NetworkContext>(
       network_service, network_context_remote.InitWithNewPipeAndPassReceiver(),
-      network::mojom::NetworkContextParams::New());
+      std::move(params));
   content::BrowserContext::GetDefaultStoragePartition(browser_context)
       ->SetNetworkContextForTesting(std::move(network_context_remote));
   return network_context;

chrome/browser/prefs/chrome_command_line_pref_store_ssl_manager_unittest.cc

@@ -4,7 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
-#include "base/test/task_environment.h"
 #include "chrome/browser/prefs/chrome_command_line_pref_store.h"
 #include "chrome/browser/ssl/ssl_config_service_manager.h"
 #include "chrome/common/chrome_switches.h"
@@ -14,6 +13,7 @@
 #include "components/prefs/testing_pref_store.h"
 #include "components/sync_preferences/pref_service_mock_factory.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/test/browser_task_environment.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 #include "services/network/public/mojom/ssl_config.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -23,7 +23,7 @@ class CommandLinePrefStoreSSLManagerTest : public testing::Test {
   CommandLinePrefStoreSSLManagerTest() {}
 
  protected:
-  base::test::SingleThreadTaskEnvironment task_environment_;
+  content::BrowserTaskEnvironment task_environment_;
 };
 
 // Test that command-line settings for SSL versions are respected and that they

chrome/browser/ssl/ssl_config_service_manager_pref_unittest.cc

@@ -9,13 +9,13 @@
 #include "base/feature_list.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
-#include "base/test/task_environment.h"
 #include "base/values.h"
 #include "chrome/browser/ssl/ssl_config_service_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/testing_pref_service.h"
 #include "content/public/browser/network_service_instance.h"
+#include "content/public/test/browser_task_environment.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "net/cert/cert_verifier.h"
 #include "net/ssl/ssl_config.h"
@@ -90,7 +90,7 @@ class SSLConfigServiceManagerPrefTest : public testing::Test,
   }
 
  protected:
-  base::test::SingleThreadTaskEnvironment task_environment_;
+  content::BrowserTaskEnvironment task_environment_;
 
   TestingPrefServiceSimple local_state_;