Add a SafeSearch preference, policy and implementation.

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 <set>
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/network_delegate.h"
+#include "net/url_request/url_request.h"
 
 class CookieSettings;
 class ExtensionInfoMap;
 class ManagedModeURLFilter;
 class PrefService;
 template<class T> class PrefMember;
 
 typedef PrefMember<bool> BooleanPrefMember;
 
 namespace chrome_browser_net {
@@ skipping 21 matching lines @@
   // settings are enforced on all observed network requests.
   ChromeNetworkDelegate(
       extensions::EventRouterForwarder* event_router,
       ExtensionInfoMap* extension_info_map,
       const policy::URLBlacklistManager* url_blacklist_manager,
       const ManagedModeURLFilter* managed_mode_url_filter,
       void* profile,
       CookieSettings* cookie_settings,
       BooleanPrefMember* enable_referrers,
       BooleanPrefMember* enable_do_not_track,
+      BooleanPrefMember* enable_safesearch,

[Pam (message me for reviews), 2012/10/17 11:37:37]

As above, "force" (or "require", etc.) rather than "enable". The others should
be changed too, but that might want to match policy-name changes, which is a
much bigger deal.

[Sergiu, 2012/10/17 14:48:58]

Done.

       chrome_browser_net::LoadTimeStats* load_time_stats);
   virtual ~ChromeNetworkDelegate();
 
   // 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_do_not_track| can be NULL.
   // This method should be called on the UI thread.
   static void InitializePrefsOnUIThread(BooleanPrefMember* enable_referrers,
                                         BooleanPrefMember* enable_do_not_track,
+                                        BooleanPrefMember* enable_safesearch,
                                         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 ChromeNetworkDelegateTest;
 
   // NetworkDelegate implementation.
@@ skipping 42 matching lines @@
 
   scoped_refptr<extensions::EventRouterForwarder> event_router_;
   void* profile_;
   scoped_refptr<CookieSettings> cookie_settings_;
 
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
   // Weak, owned by our owner.
   BooleanPrefMember* enable_referrers_;
   BooleanPrefMember* enable_do_not_track_;
+  BooleanPrefMember* enable_safesearch_;

[battre, 2012/10/16 16:05:49]

how about renaming this to enforce_google_safesearch_?

[Sergiu, 2012/10/17 14:48:58]

Done.

 
   // Weak, owned by our owner.
   const policy::URLBlacklistManager* url_blacklist_manager_;
 
   // Weak pointer. The owner of this object needs to make sure that the
   // |managed_mode_url_filter_| outlives it.
   const ManagedModeURLFilter* managed_mode_url_filter_;
 
   // When true, allow access to all file:// URLs.
   static bool g_allow_file_access_;
 
+  // Set of requests modified by the managed mode which can not be
+  // altered by extensions.
+  std::set<net::URLRequest*> mod_by_managed_mode_;

[battre, 2012/10/16 16:05:49]

I think we should rename this to "modified_by_managed_mode_" even it if its
long. We don't allow abbreviations.

[Joao da Silva, 2012/10/16 16:26:46]

Use a more descriptive name:

modified_by_managed_mode_;

[Bernhard Bauer, 2012/10/16 16:37:33]

What is this "managed mode" you speak of? ;-) The setting is general.

[Pam (message me for reviews), 2012/10/17 11:37:37]

So "modified_by_policy_", with a comment to match.

[Sergiu, 2012/10/17 14:48:58]

Done.

[Sergiu, 2012/10/17 14:48:58]

Done.

[Sergiu, 2012/10/17 14:48:58]

Done.

+
   // 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_;
 
   // Pointer to IOThread global, should outlive ChromeNetworkDelegate.
   chrome_browser_net::LoadTimeStats* load_time_stats_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_