Convert content/public/test to Once/Repeating callbacks (pt 1)

Bug: 1007763
Change-Id: I2d0a7c9f1fea7b4357c2f961290b40bcac29af8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1930281
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718053}

content/public/test/browser_test_base.cc

@@ -377,7 +377,7 @@ void BrowserTestBase::SetUp() {
   base::FeatureList::ClearInstanceForTesting();
 
   auto created_main_parts_closure =
-      std::make_unique<CreatedMainPartsClosure>(base::Bind(
+      std::make_unique<CreatedMainPartsClosure>(base::BindOnce(
           &BrowserTestBase::CreatedBrowserMainParts, base::Unretained(this)));
 
 #if defined(OS_ANDROID)
@@ -456,8 +456,8 @@ void BrowserTestBase::SetUp() {
     base::RunLoop loop{base::RunLoop::Type::kNestableTasksAllowed};
 
     auto ui_task = std::make_unique<base::OnceClosure>(
-        base::Bind(&BrowserTestBase::WaitUntilJavaIsReady,
-                   base::Unretained(this), loop.QuitClosure()));
+        base::BindOnce(&BrowserTestBase::WaitUntilJavaIsReady,
+                       base::Unretained(this), loop.QuitClosure()));
 
     // The MainFunctionParams must out-live all the startup tasks running.
     MainFunctionParams params(*command_line);
@@ -681,8 +681,8 @@ void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
     base::RunLoop run_loop;
     TracingController::GetInstance()->StopTracing(
         TracingControllerImpl::CreateFileEndpoint(
-            trace_file, base::Bind(&TraceStopTracingComplete,
-                                   run_loop.QuitClosure(), trace_file)));
+            trace_file, base::BindOnce(&TraceStopTracingComplete,
+                                       run_loop.QuitClosure(), trace_file)));
     run_loop.Run();
   }
 

content/public/test/browser_test_utils.cc

@@ -462,12 +462,15 @@ CrossSiteRedirectResponseHandler(const net::EmbeddedTestServer* test_server,
 // WillStartRequest callback. RegisterThrottleForTesting has this behavior.
 class TestNavigationManagerThrottle : public NavigationThrottle {
  public:
-  TestNavigationManagerThrottle(NavigationHandle* handle,
-                                base::Closure on_will_start_request_closure,
-                                base::Closure on_will_process_response_closure)
+  TestNavigationManagerThrottle(
+      NavigationHandle* handle,
+      base::OnceClosure on_will_start_request_closure,
+      base::OnceClosure on_will_process_response_closure)
       : NavigationThrottle(handle),
-        on_will_start_request_closure_(on_will_start_request_closure),
-        on_will_process_response_closure_(on_will_process_response_closure) {}
+        on_will_start_request_closure_(
+            std::move(on_will_start_request_closure)),
+        on_will_process_response_closure_(
+            std::move(on_will_process_response_closure)) {}
   ~TestNavigationManagerThrottle() override {}
 
   const char* GetNameForLogging() override {
@@ -477,19 +480,21 @@ class TestNavigationManagerThrottle : public NavigationThrottle {
  private:
   // NavigationThrottle:
   NavigationThrottle::ThrottleCheckResult WillStartRequest() override {
+    DCHECK(on_will_start_request_closure_);
     base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   on_will_start_request_closure_);
+                   std::move(on_will_start_request_closure_));
     return NavigationThrottle::DEFER;
   }
 
   NavigationThrottle::ThrottleCheckResult WillProcessResponse() override {
+    DCHECK(on_will_process_response_closure_);
     base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   on_will_process_response_closure_);
+                   std::move(on_will_process_response_closure_));
     return NavigationThrottle::DEFER;
   }
 
-  base::Closure on_will_start_request_closure_;
-  base::Closure on_will_process_response_closure_;
+  base::OnceClosure on_will_start_request_closure_;
+  base::OnceClosure on_will_process_response_closure_;
 };
 
 bool HasGzipHeader(const base::RefCountedMemory& maybe_gzipped) {
@@ -821,7 +826,7 @@ void WaitForResizeComplete(WebContents* web_contents) {
   if (!IsResizeComplete(&dispatcher_test, widget_host)) {
     WindowedNotificationObserver resize_observer(
         NOTIFICATION_RENDER_WIDGET_HOST_DID_UPDATE_VISUAL_PROPERTIES,
-        base::Bind(IsResizeComplete, &dispatcher_test, widget_host));
+        base::BindRepeating(IsResizeComplete, &dispatcher_test, widget_host));
     resize_observer.Wait();
   }
 }
@@ -836,7 +841,7 @@ void WaitForResizeComplete(WebContents* web_contents) {
   if (!IsResizeComplete(widget_host)) {
     WindowedNotificationObserver resize_observer(
         NOTIFICATION_RENDER_WIDGET_HOST_DID_UPDATE_VISUAL_PROPERTIES,
-        base::Bind(IsResizeComplete, widget_host));
+        base::BindRepeating(IsResizeComplete, widget_host));
     resize_observer.Wait();
   }
 }
@@ -1901,8 +1906,8 @@ void FetchHistogramsFromChildProcesses() {
 }
 
 void SetupCrossSiteRedirector(net::EmbeddedTestServer* embedded_test_server) {
-  embedded_test_server->RegisterRequestHandler(
-      base::Bind(&CrossSiteRedirectResponseHandler, embedded_test_server));
+  embedded_test_server->RegisterRequestHandler(base::BindRepeating(
+      &CrossSiteRedirectResponseHandler, embedded_test_server));
 }
 
 void WaitForInterstitialAttach(content::WebContents* web_contents) {
@@ -2475,8 +2480,8 @@ class WebContentsAddedObserver::RenderViewCreatedObserver
 
 WebContentsAddedObserver::WebContentsAddedObserver()
     : web_contents_created_callback_(
-          base::Bind(&WebContentsAddedObserver::WebContentsCreated,
-                     base::Unretained(this))),
+          base::BindRepeating(&WebContentsAddedObserver::WebContentsCreated,
+                              base::Unretained(this))),
       web_contents_(nullptr) {
   WebContentsImpl::FriendWrapper::AddCreatedCallbackForTesting(
       web_contents_created_callback_);
@@ -2907,10 +2912,10 @@ void TestNavigationManager::DidStartNavigation(NavigationHandle* handle) {
   std::unique_ptr<NavigationThrottle> throttle(
       new TestNavigationManagerThrottle(
           request_,
-          base::Bind(&TestNavigationManager::OnWillStartRequest,
-                     weak_factory_.GetWeakPtr()),
-          base::Bind(&TestNavigationManager::OnWillProcessResponse,
-                     weak_factory_.GetWeakPtr())));
+          base::BindOnce(&TestNavigationManager::OnWillStartRequest,
+                         weak_factory_.GetWeakPtr()),
+          base::BindOnce(&TestNavigationManager::OnWillProcessResponse,
+                         weak_factory_.GetWeakPtr())));
   request_->RegisterThrottleForTesting(std::move(throttle));
 }
 

content/public/test/browser_test_utils.h

@@ -1158,7 +1158,7 @@ class WebContentsAddedObserver {
   void WebContentsCreated(WebContents* web_contents);
 
   // Callback to WebContentCreated(). Cached so that we can unregister it.
-  base::Callback<void(WebContents*)> web_contents_created_callback_;
+  base::RepeatingCallback<void(WebContents*)> web_contents_created_callback_;
 
   WebContents* web_contents_;
   std::unique_ptr<RenderViewCreatedObserver> child_observer_;