Extract the SafeSearch client to a separate directory

chrome/browser/supervised_user/supervised_user_url_filter.h

 // Copyright 2014 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_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_
 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/values.h"
+#include "chrome/browser/safe_search/safe_search_url_checker.h"
 #include "chrome/browser/supervised_user/supervised_user_site_list.h"
 #include "chrome/browser/supervised_user/supervised_users.h"
 #include "components/supervised_user_error_page/supervised_user_error_page.h"
 
 class GURL;
 class SupervisedUserBlacklist;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 class GURL;
-class SupervisedUserAsyncURLChecker;
+class SafeSearchURLChecker;

[Marc Treib, 2016/10/06 13:16:42]

Not needed if you include the header anyway.

[msramek, 2016/10/06 15:08:41]

Done.

 
 // This class manages the filtering behavior for a given URL, i.e. it tells
 // callers if a given URL should be allowed, blocked or warned about. It uses
 // information from multiple sources:
 //   * A default setting (allow, block or warn).
 //   * The set of installed and enabled whitelists which contain URL patterns
 //     and hostname hashes that should be allowed.
 //   * User-specified manual overrides (allow or block) for either sites
 //     (hostnames) or exact URLs, which take precedence over the previous
 //     sources.
@@ skipping 136 matching lines @@
 
   void SetContents(std::unique_ptr<Contents> url_matcher);
 
   FilteringBehavior GetFilteringBehaviorForURL(
       const GURL& url,
       bool manual_only,
       supervised_user_error_page::FilteringBehaviorReason* reason) const;
 
   void CheckCallback(const FilteringBehaviorCallback& callback,
                      const GURL& url,
-                     FilteringBehavior behavior,
+                     SafeSearchURLChecker::Classification classification,
                      bool uncertain) const;
 
   // This is mutable to allow notification in const member functions.
   mutable base::ObserverList<Observer> observers_;
 
   FilteringBehavior default_behavior_;
   std::unique_ptr<Contents> contents_;
 
   // Maps from a URL to whether it is manually allowed (true) or blocked
   // (false).
   std::map<GURL, bool> url_map_;
 
   // Maps from a hostname to whether it is manually allowed (true) or blocked
   // (false).
   std::map<std::string, bool> host_map_;
 
   // Not owned.
   const SupervisedUserBlacklist* blacklist_;
 
-  std::unique_ptr<SupervisedUserAsyncURLChecker> async_url_checker_;
+  std::unique_ptr<SafeSearchURLChecker> async_url_checker_;
 
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserURLFilter);
 };
 
 #endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_