| Index: chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| index e457dd6c8ee8d5d316a56fe4f94f731bb40be9fe..e099a789fdaf629c2ee4bdef09dc5f513d9862de 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
|
| @@ -20,7 +20,6 @@
|
| #include "base/strings/string_util.h"
|
| #include "base/task_runner_util.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| -#include "chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.h"
|
| #include "chrome/browser/supervised_user/experimental/supervised_user_blacklist.h"
|
| #include "components/policy/core/browser/url_blacklist_manager.h"
|
| #include "components/url_formatter/url_fixer.h"
|
| @@ -47,6 +46,19 @@ struct HashHostnameHash {
|
| }
|
| };
|
|
|
| +SupervisedUserURLFilter::FilteringBehavior
|
| +GetBehaviorFromSafeSearchClassification(
|
| + SafeSearchURLChecker::Classification classification) {
|
| + switch (classification) {
|
| + case SafeSearchURLChecker::Classification::SAFE:
|
| + return SupervisedUserURLFilter::ALLOW;
|
| + case SafeSearchURLChecker::Classification::UNSAFE:
|
| + return SupervisedUserURLFilter::BLOCK;
|
| + }
|
| + NOTREACHED();
|
| + return SupervisedUserURLFilter::BLOCK;
|
| +}
|
| +
|
| } // namespace
|
|
|
| struct SupervisedUserURLFilter::Contents {
|
| @@ -451,7 +463,7 @@ void SupervisedUserURLFilter::SetManualURLs(
|
|
|
| void SupervisedUserURLFilter::InitAsyncURLChecker(
|
| net::URLRequestContextGetter* context) {
|
| - async_url_checker_.reset(new SupervisedUserAsyncURLChecker(context));
|
| + async_url_checker_.reset(new SafeSearchURLChecker(context));
|
| }
|
|
|
| void SupervisedUserURLFilter::ClearAsyncURLChecker() {
|
| @@ -493,10 +505,13 @@ void SupervisedUserURLFilter::SetContents(std::unique_ptr<Contents> contents) {
|
| void SupervisedUserURLFilter::CheckCallback(
|
| const FilteringBehaviorCallback& callback,
|
| const GURL& url,
|
| - FilteringBehavior behavior,
|
| + SafeSearchURLChecker::Classification classification,
|
| bool uncertain) const {
|
| DCHECK(default_behavior_ != BLOCK);
|
|
|
| + FilteringBehavior behavior =
|
| + GetBehaviorFromSafeSearchClassification(classification);
|
| +
|
| callback.Run(behavior, supervised_user_error_page::ASYNC_CHECKER, uncertain);
|
| FOR_EACH_OBSERVER(
|
| Observer, observers_,
|
|
|