Convert SupervisedUserResourceThrottle to a NavigationThrottle.

chrome/browser/supervised_user/supervised_user_navigation_observer.cc

 // 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.
 
 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 19 matching lines @@
   supervised_user_service_->RemoveObserver(this);
 }
 
 SupervisedUserNavigationObserver::SupervisedUserNavigationObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents), weak_ptr_factory_(this) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   supervised_user_service_ =
       SupervisedUserServiceFactory::GetForProfile(profile);
-  url_filter_ = supervised_user_service_->GetURLFilterForUIThread();
+  url_filter_ = supervised_user_service_->GetURLFilter();
   supervised_user_service_->AddObserver(this);
 }
 
 // static
 void SupervisedUserNavigationObserver::OnRequestBlocked(
-    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
+    content::WebContents* web_contents,
     const GURL& url,
     supervised_user_error_page::FilteringBehaviorReason reason,
     const base::Callback<void(bool)>& callback) {
-  content::WebContents* web_contents = web_contents_getter.Run();
-  if (!web_contents) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE, base::Bind(callback, false));
-    return;
-  }
-
   SupervisedUserNavigationObserver* navigation_observer =
       SupervisedUserNavigationObserver::FromWebContents(web_contents);
   if (navigation_observer)
     navigation_observer->OnRequestBlockedInternal(url);
 
   // Show the interstitial.
   const bool initial_page_load = true;
   SupervisedUserInterstitial::Show(web_contents, url, reason, initial_page_load,
                                    callback);
 }
@@ skipping 62 matching lines @@
   if (url != web_contents()->GetLastCommittedURL())
     return;
 
   const bool initial_page_load = false;
   if (behavior == SupervisedUserURLFilter::FilteringBehavior::BLOCK) {
     SupervisedUserInterstitial::Show(web_contents(), url, reason,
                                      initial_page_load,
                                      base::Callback<void(bool)>());
   }
 }