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 200 matching lines @@
   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;

[Thiemo Nagel, 2015/04/14 14:39:58]

For full test coverage, these bools most be converted to tri-states: true,
false, unset.

[Marc Treib, 2015/04/14 14:47:38]

See above: There really is no tri-state logic here.

     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;
+    // 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);
   }
 }
 
 // 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)
@@ skipping 100 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));
 }