Add field trial for SafeBrowsingNetworkContexts

SafeBrowsingNetworkContexts is ready to roll out to Beta (see
cl/337414650), so add a field trial for it. A few tests fail with
the feature enabled, so we add a little code to fix those tests as
well.

Change-Id: I5254a0b632f5319f50d29756a996e69dcd3acc43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2477252Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Reviewed-by: Bettina Dea <bdea@chromium.org>
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820901}

chrome/browser/safe_browsing/client_side_detection_service.cc

@@ -72,15 +72,17 @@ ClientSideDetectionService::ClientSideDetectionService(Profile* profile)
     : profile_(profile),
       enabled_(false),
       extended_reporting_(false),
-      url_loader_factory_(
-          g_browser_process->safe_browsing_service()
-              ? g_browser_process->safe_browsing_service()->GetURLLoaderFactory(
-                    profile)
-              : nullptr) {
+      url_loader_factory_(nullptr) {
   // |profile_| can be null in unit tests
   if (!profile_)
     return;
 
+  if (g_browser_process->safe_browsing_service()) {
+    url_loader_factory_ =
+        g_browser_process->safe_browsing_service()->GetURLLoaderFactory(
+            profile);
+  }
+
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kSafeBrowsingEnabled,

chrome/browser/safe_browsing/safe_browsing_service.cc

@@ -192,8 +192,14 @@ SafeBrowsingService::GetURLLoaderFactory(Profile* profile) {
   if (!base::FeatureList::IsEnabled(kSafeBrowsingSeparateNetworkContexts))
     return GetURLLoaderFactory();
 
-  return services_delegate_->GetSafeBrowsingNetworkContext(profile)
-      ->GetURLLoaderFactory();
+  safe_browsing::SafeBrowsingNetworkContext* network_context =
+      services_delegate_->GetSafeBrowsingNetworkContext(profile);
+
+  // |network_context| may be null in tests
+  if (!network_context)
+    return nullptr;
+
+  return network_context->GetURLLoaderFactory();
 }
 
 void SafeBrowsingService::FlushNetworkInterfaceForTesting() {

chrome/browser/safe_browsing/services_delegate.cc

@@ -115,8 +115,10 @@ SafeBrowsingNetworkContext* ServicesDelegate::GetSafeBrowsingNetworkContext(
     Profile* profile) const {
   DCHECK(profile);
   DCHECK(base::FeatureList::IsEnabled(kSafeBrowsingSeparateNetworkContexts));
+  // In tests, we may not have been notified of Profile creation.
   auto it = network_context_map_.find(profile);
-  DCHECK(it != network_context_map_.end());
+  if (it == network_context_map_.end())
+    return nullptr;
   return it->second.get();
 }
 

chrome/browser/safe_browsing/test_safe_browsing_service.cc

@@ -154,6 +154,13 @@ TestSafeBrowsingService::GetURLLoaderFactory() {
   return SafeBrowsingService::GetURLLoaderFactory();
 }
 
+scoped_refptr<network::SharedURLLoaderFactory>
+TestSafeBrowsingService::GetURLLoaderFactory(Profile* profile) {
+  if (use_test_url_loader_factory_)
+    return test_shared_loader_factory_;
+  return SafeBrowsingService::GetURLLoaderFactory(profile);
+}
+
 // TestSafeBrowsingServiceFactory functions:
 TestSafeBrowsingServiceFactory::TestSafeBrowsingServiceFactory()
     : test_safe_browsing_service_(nullptr), use_v4_local_db_manager_(false) {}

chrome/browser/safe_browsing/test_safe_browsing_service.h

@@ -95,6 +95,8 @@ class TestSafeBrowsingService : public SafeBrowsingService,
   ResourceRequestDetector* CreateResourceRequestDetector() override;
 
   scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
+  scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory(
+      Profile* profile) override;
 
  private:
   std::unique_ptr<V4ProtocolConfig> v4_protocol_config_;

testing/variations/fieldtrial_testing_config.json

@@ -6177,6 +6177,24 @@
             ]
         }
     ],
+    "SafeBrowsingNetworkContexts": [
+        {
+            "platforms": [
+                "windows",
+                "linux",
+                "mac"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "SafeBrowsingRemoveCookies",
+                        "SafeBrowsingSeparateNetworkContexts"
+                    ]
+                }
+            ]
+        }
+    ],
     "SafeBrowsingPasswordProtectionForSavedPasswords": [
         {
             "platforms": [