Remove usage of base::Bind in async_document_subresource_filter

This API is deprecated. Bind is replaced by BindOnce which is a
semantics change, but shouldn't result in a behavior change.

Bug: 884057
Change-Id: I06e728a88a84ed6e042e6f2e90f5a0ad9d40eecb
Reviewed-on: https://chromium-review.googlesource.com/1225994Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591455}

components/subresource_filter/content/browser/activation_state_computing_navigation_throttle.cc

@@ -131,9 +131,9 @@ void ActivationStateComputingNavigationThrottle::CheckActivationState() {
   // will drop the message via weak pointer semantics.
   async_filter_ = std::make_unique<AsyncDocumentSubresourceFilter>(
       ruleset_handle_, std::move(params),
-      base::Bind(&ActivationStateComputingNavigationThrottle::
-                     OnActivationStateComputed,
-                 weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(&ActivationStateComputingNavigationThrottle::
+                         OnActivationStateComputed,
+                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ActivationStateComputingNavigationThrottle::OnActivationStateComputed(

components/subresource_filter/content/browser/async_document_subresource_filter.cc

@@ -102,7 +102,7 @@ InitializationParams& InitializationParams::operator=(InitializationParams&&) =
 AsyncDocumentSubresourceFilter::AsyncDocumentSubresourceFilter(
     VerifiedRuleset::Handle* ruleset_handle,
     InitializationParams params,
-    base::Callback<void(mojom::ActivationState)> activation_state_callback)
+    base::OnceCallback<void(mojom::ActivationState)> activation_state_callback)
     : task_runner_(ruleset_handle->task_runner()),
       core_(new Core(), base::OnTaskRunnerDeleter(task_runner_)),
       weak_ptr_factory_(this) {
@@ -127,10 +127,10 @@ AsyncDocumentSubresourceFilter::~AsyncDocumentSubresourceFilter() {
 }
 
 void AsyncDocumentSubresourceFilter::OnActivateStateCalculated(
-    base::Callback<void(mojom::ActivationState)> activation_state_callback,
+    base::OnceCallback<void(mojom::ActivationState)> activation_state_callback,
     mojom::ActivationState activation_state) {
   activation_state_ = activation_state;
-  activation_state_callback.Run(activation_state);
+  std::move(activation_state_callback).Run(activation_state);
 }
 
 void AsyncDocumentSubresourceFilter::GetLoadPolicyForSubdocument(
@@ -142,7 +142,7 @@ void AsyncDocumentSubresourceFilter::GetLoadPolicyForSubdocument(
   // too big and won't be allowed anyway (e.g., it's a data: URI).
   base::PostTaskAndReplyWithResult(
       task_runner_, FROM_HERE,
-      base::Bind(
+      base::BindOnce(
           [](AsyncDocumentSubresourceFilter::Core* core,
              const GURL& subdocument_url) {
             DCHECK(core);

components/subresource_filter/content/browser/async_document_subresource_filter.h

@@ -45,7 +45,7 @@ mojom::ActivationState ComputeActivationState(
 // while the DSF is retrieved on the |task_runner| in a deferred manner.
 class AsyncDocumentSubresourceFilter {
  public:
-  using LoadPolicyCallback = base::Callback<void(LoadPolicy)>;
+  using LoadPolicyCallback = base::OnceCallback<void(LoadPolicy)>;
 
   class Core;
 
@@ -101,7 +101,8 @@ class AsyncDocumentSubresourceFilter {
   AsyncDocumentSubresourceFilter(
       VerifiedRuleset::Handle* ruleset_handle,
       InitializationParams params,
-      base::Callback<void(mojom::ActivationState)> activation_state_callback);
+      base::OnceCallback<void(mojom::ActivationState)>
+          activation_state_callback);
 
   ~AsyncDocumentSubresourceFilter();
 
@@ -140,7 +141,8 @@ class AsyncDocumentSubresourceFilter {
 
  private:
   void OnActivateStateCalculated(
-      base::Callback<void(mojom::ActivationState)> activation_state_callback,
+      base::OnceCallback<void(mojom::ActivationState)>
+          activation_state_callback,
       mojom::ActivationState activation_state);
 
   // Note: Raw pointer, |core_| already holds a reference to |task_runner_|.

components/subresource_filter/content/browser/async_document_subresource_filter_test_utils.cc

@@ -17,10 +17,10 @@ TestActivationStateCallbackReceiver::TestActivationStateCallbackReceiver() =
 TestActivationStateCallbackReceiver::~TestActivationStateCallbackReceiver() =
     default;
 
-base::Callback<void(mojom::ActivationState)>
+base::OnceCallback<void(mojom::ActivationState)>
 TestActivationStateCallbackReceiver::GetCallback() {
-  return base::Bind(&TestActivationStateCallbackReceiver::Callback,
-                    base::Unretained(this));
+  return base::BindOnce(&TestActivationStateCallbackReceiver::Callback,
+                        base::Unretained(this));
 }
 
 void TestActivationStateCallbackReceiver::WaitForActivationDecision() {

components/subresource_filter/content/browser/async_document_subresource_filter_test_utils.h

@@ -21,7 +21,7 @@ class TestActivationStateCallbackReceiver {
   TestActivationStateCallbackReceiver();
   ~TestActivationStateCallbackReceiver();
 
-  base::Callback<void(mojom::ActivationState)> GetCallback();
+  base::OnceCallback<void(mojom::ActivationState)> GetCallback();
   void WaitForActivationDecision();
   void ExpectReceivedOnce(const mojom::ActivationState& expected_state) const;
 

components/subresource_filter/content/browser/async_document_subresource_filter_unittest.cc

@@ -95,8 +95,9 @@ class TestCallbackReceiver {
  public:
   TestCallbackReceiver() = default;
 
-  base::Closure GetClosure() {
-    return base::Bind(&TestCallbackReceiver::Callback, base::Unretained(this));
+  base::OnceClosure GetClosure() {
+    return base::BindOnce(&TestCallbackReceiver::Callback,
+                          base::Unretained(this));
   }
   int callback_count() const { return callback_count_; }
 
@@ -113,8 +114,8 @@ class LoadPolicyCallbackReceiver {
   LoadPolicyCallbackReceiver() = default;
 
   AsyncDocumentSubresourceFilter::LoadPolicyCallback GetCallback() {
-    return base::Bind(&LoadPolicyCallbackReceiver::Callback,
-                      base::Unretained(this));
+    return base::BindOnce(&LoadPolicyCallbackReceiver::Callback,
+                          base::Unretained(this));
   }
   void ExpectReceivedOnce(LoadPolicy load_policy) const {
     ASSERT_EQ(1, callback_count_);

components/subresource_filter/content/browser/subframe_navigation_filtering_throttle.cc

@@ -78,8 +78,9 @@ SubframeNavigationFilteringThrottle::DeferToCalculateLoadPolicy() {
     return PROCEED;
   parent_frame_filter_->GetLoadPolicyForSubdocument(
       navigation_handle()->GetURL(),
-      base::Bind(&SubframeNavigationFilteringThrottle::OnCalculatedLoadPolicy,
-                 weak_ptr_factory_.GetWeakPtr()));
+      base::BindOnce(
+          &SubframeNavigationFilteringThrottle::OnCalculatedLoadPolicy,
+          weak_ptr_factory_.GetWeakPtr()));
   last_defer_timestamp_ = base::TimeTicks::Now();
   return DEFER;
 }