Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled

chrome/browser/net/chrome_network_delegate_unittest.cc

Index: chrome/browser/net/chrome_network_delegate_unittest.cc
diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc
index 3136bc7792e341a37571b740f1f8a34d418b9056..0d0f144a3c899bcd838c68b75ce6aae132929858 100644
--- a/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -223,9 +223,12 @@ TEST_F(ChromeNetworkDelegateSafeSearchTest, SafeSearch) {
     bool youtube_safety_mode = i / 4;
     SetSafeSearch(safe_search, google_safe_search, youtube_safety_mode);
 
-    // The old "SafeSearch" policy implies both Google and YouTube.
-    bool expect_google_safe_search = safe_search || google_safe_search;
-    bool expect_youtube_safety_mode = safe_search || youtube_safety_mode;
+    // The legacy "SafeSearch" policy implies both Google and YouTube, but it is
+    // ignored if either of the new policies are enabled.
+    bool expect_google_safe_search = google_safe_search ||
+        (!google_safe_search && !youtube_safety_mode && safe_search);
+    bool expect_youtube_safety_mode = youtube_safety_mode ||
+        (!google_safe_search && !youtube_safety_mode && safe_search);
     QueryURL(expect_google_safe_search, expect_youtube_safety_mode);
   }
 }