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..bd9fcb5571d558c0822b64161e21e1e86056c612 100644
--- a/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -139,7 +139,6 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
         &enable_referrers_,
         NULL,
-        &force_safe_search_,
         &force_google_safe_search_,
         &force_youtube_safety_mode_,
         profile_.GetTestingPrefService());
@@ -149,17 +148,14 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
   scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate() {
     scoped_ptr<ChromeNetworkDelegate> network_delegate(
         new ChromeNetworkDelegate(forwarder(), &enable_referrers_));
-    network_delegate->set_force_safe_search(&force_safe_search_);
     network_delegate->set_force_google_safe_search(&force_google_safe_search_);
     network_delegate->set_force_youtube_safety_mode(
         &force_youtube_safety_mode_);
     return network_delegate.Pass();
   }
 
-  void SetSafeSearch(bool safe_search,
-                     bool google_safe_search,
+  void SetSafeSearch(bool google_safe_search,
                      bool youtube_safety_mode) {
-    force_safe_search_.SetValue(safe_search);
     force_google_safe_search_.SetValue(google_safe_search);
     force_youtube_safety_mode_.SetValue(youtube_safety_mode);
   }
@@ -203,7 +199,6 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
 #endif
   TestingProfile profile_;
   BooleanPrefMember enable_referrers_;
-  BooleanPrefMember force_safe_search_;
   BooleanPrefMember force_google_safe_search_;
   BooleanPrefMember force_youtube_safety_mode_;
   scoped_ptr<net::URLRequest> request_;
@@ -216,17 +211,13 @@ TEST_F(ChromeNetworkDelegateSafeSearchTest, SafeSearch) {
   scoped_ptr<net::NetworkDelegate> delegate(CreateNetworkDelegate());
   SetDelegate(delegate.get());
 
-  // Loop over all combinations of the three policies.
-  for (int i = 0; i < 8; i++) {
-    bool safe_search = i % 2;
-    bool google_safe_search = (i / 2) % 2;
-    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;
-    QueryURL(expect_google_safe_search, expect_youtube_safety_mode);
+  // Loop over all combinations of the two policies.
+  for (int i = 0; i < 4; i++) {
+    bool google_safe_search = i % 2;
+    bool youtube_safety_mode = i / 2;
+    SetSafeSearch(google_safe_search, youtube_safety_mode);
+
+    QueryURL(google_safe_search, youtube_safety_mode);
   }
 }
 
@@ -247,7 +238,7 @@ class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
 
   void SetUp() override {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
-        &enable_referrers_, NULL, NULL, NULL, NULL,
+        &enable_referrers_, NULL, NULL, NULL,
         profile_.GetTestingPrefService());
   }