Revert "Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy"

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 <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/browser/net/safe_search_util.h"
 #include "components/data_use_measurement/content/data_use_measurement.h"
 #include "components/metrics/data_use_tracker.h"
 #include "components/prefs/pref_member.h"
 #include "net/base/network_delegate_impl.h"
 
 class ChromeExtensionsNetworkDelegate;
 class PrefService;
 
 template<class T> class PrefMember;
 
@@ skipping 42 matching lines @@
   ~ChromeNetworkDelegate() override;
 
   // Pass through to ChromeExtensionsNetworkDelegate::set_extension_info_map().
   void set_extension_info_map(extensions::InfoMap* extension_info_map);
 
   void set_url_blacklist_manager(
       const policy::URLBlacklistManager* url_blacklist_manager) {
     url_blacklist_manager_ = url_blacklist_manager;
   }
 
-  // If |profile| is nullptr or not set, events will be broadcast to all
-  // profiles, otherwise they will only be sent to the specified profile.
+  // If |profile| is NULL or not set, events will be broadcast to all profiles,
+  // otherwise they will only be sent to the specified profile.
   // Also pass through to ChromeExtensionsNetworkDelegate::set_profile().
   void set_profile(void* profile);
 
   // |profile_path| is used to locate the "Downloads" folder on Chrome OS. If it
   // is set, the location of the Downloads folder for the profile is added to
   // the whitelist for accesses via file: scheme.
   void set_profile_path(const base::FilePath& profile_path) {
     profile_path_ = profile_path;
   }
 
-  // If |cookie_settings| is nullptr or not set, all cookies are enabled,
+  // If |cookie_settings| is NULL or not set, all cookies are enabled,
   // otherwise the settings are enforced on all observed network requests.
   // Not inlined because we assign a scoped_refptr, which requires us to include
   // the header file. Here we just forward-declare it.
   void set_cookie_settings(content_settings::CookieSettings* cookie_settings);
 
   void set_enable_do_not_track(BooleanPrefMember* enable_do_not_track) {
     enable_do_not_track_ = enable_do_not_track;
   }
 
   void set_force_google_safe_search(
       BooleanPrefMember* force_google_safe_search) {
     force_google_safe_search_ = force_google_safe_search;
   }
 
-  void set_force_youtube_restrict(
-      IntegerPrefMember* force_youtube_restrict) {
-    force_youtube_restrict_ = force_youtube_restrict;
+  void set_force_youtube_safety_mode(
+      BooleanPrefMember* force_youtube_safety_mode) {
+    force_youtube_safety_mode_ = force_youtube_safety_mode;
   }
 
   void set_allowed_domains_for_apps(
       StringPrefMember* allowed_domains_for_apps) {
     allowed_domains_for_apps_ = allowed_domains_for_apps;
   }
 
   void set_domain_reliability_monitor(
       domain_reliability::DomainReliabilityMonitor* monitor) {
     domain_reliability_monitor_ = monitor;
   }
 
   void set_data_use_aggregator(
       data_usage::DataUseAggregator* data_use_aggregator,
       bool is_data_usage_off_the_record);
 
   // Binds the pref members to |pref_service| and moves them to the IO thread.
-  // |enable_referrers| cannot be nullptr, the others can.
+  // |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_google_safe_search,
-      IntegerPrefMember* force_youtube_restrict,
+      BooleanPrefMember* force_youtube_safety_mode,
       StringPrefMember* allowed_domains_for_apps,
       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:
   // NetworkDelegate implementation.
   int OnBeforeURLRequest(net::URLRequest* request,
@@ skipping 51 matching lines @@
   std::unique_ptr<ChromeExtensionsNetworkDelegate> extensions_delegate_;
 
   void* profile_;
   base::FilePath profile_path_;
   scoped_refptr<content_settings::CookieSettings> cookie_settings_;
 
   // Weak, owned by our owner.
   BooleanPrefMember* enable_referrers_;
   BooleanPrefMember* enable_do_not_track_;
   BooleanPrefMember* force_google_safe_search_;
-  IntegerPrefMember* force_youtube_restrict_;
+  BooleanPrefMember* force_youtube_safety_mode_;
   StringPrefMember* allowed_domains_for_apps_;
 
   // Weak, owned by our owner.
   const policy::URLBlacklistManager* url_blacklist_manager_;
   domain_reliability::DomainReliabilityMonitor* domain_reliability_monitor_;
 
   // When true, allow access to all file:// URLs.
   static bool g_allow_file_access_;
 
   // Component to measure data use.
   data_use_measurement::DataUseMeasurement data_use_measurement_;
 
   bool experimental_web_platform_features_enabled_;
 
   // Aggregates and reports network usage.
   data_usage::DataUseAggregator* data_use_aggregator_;
   // Controls whether network usage is reported as being off the record.
   bool is_data_usage_off_the_record_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_