Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled

chrome/browser/net/chrome_network_delegate_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 121 matching lines @@
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
 #if defined(ENABLE_EXTENSIONS)
     forwarder_ = new extensions::EventRouterForwarder();
 #endif
   }
 
   void SetUp() override {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
         &enable_referrers_,
         NULL,
-        &force_safe_search_,
         &force_google_safe_search_,
         &force_youtube_safety_mode_,
         profile_.GetTestingPrefService());
   }
 
  protected:
   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);
   }
 
   void SetDelegate(net::NetworkDelegate* delegate) {
     network_delegate_ = delegate;
     context_.set_network_delegate(network_delegate_);
   }
 
   // Does a request to an arbitrary URL and verifies that the SafeSearch
@@ skipping 23 matching lines @@
     return NULL;
 #endif
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
 #if defined(ENABLE_EXTENSIONS)
   scoped_refptr<extensions::EventRouterForwarder> forwarder_;
 #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_;
   net::TestURLRequestContext context_;
   net::NetworkDelegate* network_delegate_;
   net::TestDelegate delegate_;
 };
 
 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);
+  // 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);
 
-    // 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);
+    QueryURL(google_safe_search, youtube_safety_mode);
   }
 }
 
 // Privacy Mode disables Channel Id if cookies are blocked (cr223191)
 class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
  public:
   ChromeNetworkDelegatePrivacyModeTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
 #if defined(ENABLE_EXTENSIONS)
         forwarder_(new extensions::EventRouterForwarder()),
 #endif
         cookie_settings_(CookieSettings::Factory::GetForProfile(&profile_)
                              .get()),
         kBlockedSite("http://ads.thirdparty.com"),
         kAllowedSite("http://good.allays.com"),
         kFirstPartySite("http://cool.things.com"),
         kBlockedFirstPartySite("http://no.thirdparties.com") {}
 
   void SetUp() override {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
-        &enable_referrers_, NULL, NULL, NULL, NULL,
+        &enable_referrers_, NULL, NULL, NULL,
         profile_.GetTestingPrefService());
   }
 
  protected:
   scoped_ptr<ChromeNetworkDelegate> CreateNetworkDelegate() {
     scoped_ptr<ChromeNetworkDelegate> network_delegate(
         new ChromeNetworkDelegate(forwarder(), &enable_referrers_));
     network_delegate->set_cookie_settings(cookie_settings_);
     return network_delegate.Pass();
   }
@@ skipping 78 matching lines @@
                                                        kBlockedFirstPartySite));
 
   cookie_settings_->SetCookieSetting(
       ContentSettingsPattern::FromURL(kBlockedFirstPartySite),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTING_BLOCK);
   // Privacy mode is disabled as kAllowedSite is still getting cookies
   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite,
                                                        kBlockedFirstPartySite));
 }