Policy: Ignore ForceSafeSearch if ForceGoogleSafeSearch or ForceYoutubeSafetyMode are enabled

chrome/browser/net/chrome_network_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
 #define CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 78 matching lines @@
   // the header file. Here we just forward-declare it.
   void set_cookie_settings(CookieSettings* cookie_settings);
 
   // Causes requested URLs to be fed to |predictor| via ConnectInterceptor.
   void set_predictor(chrome_browser_net::Predictor* predictor);
 
   void set_enable_do_not_track(BooleanPrefMember* enable_do_not_track) {
     enable_do_not_track_ = enable_do_not_track;
   }
 
-  void set_force_safe_search(
-      BooleanPrefMember* force_safe_search) {
-    force_safe_search_ = force_safe_search;
-  }
-
   void set_force_google_safe_search(
       BooleanPrefMember* force_google_safe_search) {
     force_google_safe_search_ = force_google_safe_search;
   }
 
   void set_force_youtube_safety_mode(
       BooleanPrefMember* force_youtube_safety_mode) {
     force_youtube_safety_mode_ = force_youtube_safety_mode;
   }
 
   void set_domain_reliability_monitor(
       domain_reliability::DomainReliabilityMonitor* monitor) {
     domain_reliability_monitor_ = monitor;
   }
 
   // Causes |OnCanThrottleRequest| to always return false, for all
   // instances of this object.
   static void NeverThrottleRequests();
 
   // Binds the pref members to |pref_service| and moves them to the IO thread.
   // |enable_referrers| cannot be NULL, the others can.
   // This method should be called on the UI thread.
   static void InitializePrefsOnUIThread(
       BooleanPrefMember* enable_referrers,
       BooleanPrefMember* enable_do_not_track,
-      BooleanPrefMember* force_safe_search,
       BooleanPrefMember* force_google_safe_search,
       BooleanPrefMember* force_youtube_safety_mode,
       PrefService* pref_service);
 
   // When called, all file:// URLs will now be accessible.  If this is not
   // called, then some platforms restrict access to file:// paths.
   static void AllowAccessToAllFiles();
 
  private:
   friend class ChromeNetworkDelegateThrottlingTest;
@@ skipping 50 matching lines @@
 
   void* profile_;
   base::FilePath profile_path_;
   scoped_refptr<CookieSettings> cookie_settings_;
 
   scoped_ptr<chrome_browser_net::ConnectInterceptor> connect_interceptor_;
 
   // Weak, owned by our owner.
   BooleanPrefMember* enable_referrers_;
   BooleanPrefMember* enable_do_not_track_;
-  BooleanPrefMember* force_safe_search_;
   BooleanPrefMember* force_google_safe_search_;
   BooleanPrefMember* force_youtube_safety_mode_;
 
   // Weak, owned by our owner.
 #if defined(ENABLE_CONFIGURATION_POLICY)
   const policy::URLBlacklistManager* url_blacklist_manager_;
 #endif
   domain_reliability::DomainReliabilityMonitor* domain_reliability_monitor_;
 
   // When true, allow access to all file:// URLs.
   static bool g_allow_file_access_;
 
   // True if OnCanThrottleRequest should always return false.
   //
   // Note: This needs to be static as the instance of
   // ChromeNetworkDelegate used may change over time, and we need to
   // set this variable once at start-up time.  It is effectively
   // static anyway since it is based on a command-line flag.
   static bool g_never_throttle_requests_;
 
   bool experimental_web_platform_features_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_