Extract the SafeSearch client to a separate directory

chrome/browser/supervised_user/supervised_user_url_filter.cc

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..505429388902b54ce30d2027f6004305101881a2 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,20 @@ struct HashHostnameHash {
   }
 };
 
+SupervisedUserURLFilter::FilteringBehavior
+GetBehaviorFromSafeSearchClassification(
+    SafeSearchURLChecker::Classification classification) {
+  switch (classification) {
+    case SafeSearchURLChecker::SAFE:
+      return SupervisedUserURLFilter::ALLOW;
+    case SafeSearchURLChecker::UNSAFE:
+      return SupervisedUserURLFilter::BLOCK;
+  }
+  NOTREACHED() << "Every SafeSearchURLChecker::Classification value must have "
+                  "a FilteringBehavior interpretation.";

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

We'll get a compile error anyway if the switch doesn't handle all cases :)

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

I know :) I just meant it as a comment and felt like putting it next to the
NOTREACHED() is a good place.

Let me just remove it, as the message is obvious. But I would keep the
NOTREACHED() to document that the "return" statement below is purely syntactical
and that it doesn't actually mean that BLOCK is the default.

[Marc Treib, 2016/10/06 15:17:15]

Yes, please do keep the NOTREACHED!

+  return SupervisedUserURLFilter::BLOCK;
+}
+
 }  // namespace
 
 struct SupervisedUserURLFilter::Contents {
@@ -451,7 +464,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 +506,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_,