Convert headless to use BindOnce and BindRepeating.

Bug: 1007791
Change-Id: Ia2eee33ff64d82c3a18abf217d1edc51a225363d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1932236Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Erik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718909}

headless/app/headless_shell.cc

@@ -775,7 +775,7 @@ int HeadlessShellMain(int argc, const char** argv) {
 
   if (command_line.HasSwitch(switches::kHideScrollbars)) {
     builder.SetOverrideWebPreferencesCallback(
-        base::Bind([](WebPreferences* preferences) {
+        base::BindRepeating([](WebPreferences* preferences) {
           preferences->hide_scrollbars = true;
         }));
   }

headless/lib/headless_browser_browsertest.cc

@@ -658,7 +658,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserAllowInsecureLocalhostTest,
 class HeadlessBrowserTestAppendCommandLineFlags : public HeadlessBrowserTest {
  public:
   HeadlessBrowserTestAppendCommandLineFlags() {
-    options()->append_command_line_flags_callback = base::Bind(
+    options()->append_command_line_flags_callback = base::BindRepeating(
         &HeadlessBrowserTestAppendCommandLineFlags::AppendCommandLineFlags,
         base::Unretained(this));
   }

headless/lib/headless_browser_context_browsertest.cc

@@ -68,7 +68,8 @@ class HeadlessBrowserContextIsolationTest
   void RunDevTooledTest() override {
     load_observer_.reset(new LoadObserver(
         devtools_client_.get(),
-        base::Bind(&HeadlessBrowserContextIsolationTest::OnFirstLoadComplete,
+        base::BindOnce(
+            &HeadlessBrowserContextIsolationTest::OnFirstLoadComplete,
             base::Unretained(this))));
     devtools_client_->GetPage()->Navigate(
         embedded_test_server()->GetURL("/hello.html").spec());
@@ -78,7 +79,8 @@ class HeadlessBrowserContextIsolationTest
     EXPECT_TRUE(load_observer_->navigation_succeeded());
     load_observer_.reset(new LoadObserver(
         devtools_client2_.get(),
-        base::Bind(&HeadlessBrowserContextIsolationTest::OnSecondLoadComplete,
+        base::BindOnce(
+            &HeadlessBrowserContextIsolationTest::OnSecondLoadComplete,
             base::Unretained(this))));
     devtools_client2_->GetPage()->Navigate(
         embedded_test_server()->GetURL("/hello.html").spec());
@@ -244,7 +246,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, ContextWebPreferences) {
       browser()
           ->CreateBrowserContextBuilder()
           .SetOverrideWebPreferencesCallback(
-              base::Bind([](WebPreferences* preferences) {
+              base::BindRepeating([](WebPreferences* preferences) {
                 preferences->hide_scrollbars = true;
               }))
           .Build();

headless/lib/headless_devtools_client_browsertest.cc

@@ -83,7 +83,7 @@ class HeadlessDevToolsClientWindowManagementTest
  public:
   void SetWindowBounds(
       const gfx::Rect& rect,
-      base::Callback<void(std::unique_ptr<browser::SetWindowBoundsResult>)>
+      base::OnceCallback<void(std::unique_ptr<browser::SetWindowBoundsResult>)>
           callback) {
     std::unique_ptr<browser::Bounds> bounds =
         browser::Bounds::Builder()
@@ -100,12 +100,12 @@ class HeadlessDevToolsClientWindowManagementTest
             .SetBounds(std::move(bounds))
             .Build();
     browser_devtools_client_->GetBrowser()->GetExperimental()->SetWindowBounds(
-        std::move(params), callback);
+        std::move(params), std::move(callback));
   }
 
   void SetWindowState(
       const browser::WindowState state,
-      base::Callback<void(std::unique_ptr<browser::SetWindowBoundsResult>)>
+      base::OnceCallback<void(std::unique_ptr<browser::SetWindowBoundsResult>)>
           callback) {
     std::unique_ptr<browser::Bounds> bounds =
         browser::Bounds::Builder().SetWindowState(state).Build();
@@ -116,11 +116,11 @@ class HeadlessDevToolsClientWindowManagementTest
             .SetBounds(std::move(bounds))
             .Build();
     browser_devtools_client_->GetBrowser()->GetExperimental()->SetWindowBounds(
-        std::move(params), callback);
+        std::move(params), std::move(callback));
   }
 
   void GetWindowBounds(
-      base::Callback<void(std::unique_ptr<browser::GetWindowBoundsResult>)>
+      base::OnceCallback<void(std::unique_ptr<browser::GetWindowBoundsResult>)>
           callback) {
     int window_id = HeadlessWebContentsImpl::From(web_contents_)->window_id();
     std::unique_ptr<browser::GetWindowBoundsParams> params =
@@ -129,7 +129,7 @@ class HeadlessDevToolsClientWindowManagementTest
             .Build();
 
     browser_devtools_client_->GetBrowser()->GetExperimental()->GetWindowBounds(
-        std::move(params), callback);
+        std::move(params), std::move(callback));
   }
 
   void CheckWindowBounds(
@@ -153,14 +153,14 @@ class HeadlessDevToolsClientChangeWindowBoundsTest
   void RunDevTooledTest() override {
     SetWindowBounds(
         gfx::Rect(100, 200, 300, 400),
-        base::Bind(
+        base::BindOnce(
             &HeadlessDevToolsClientChangeWindowBoundsTest::OnSetWindowBounds,
             base::Unretained(this)));
   }
 
   void OnSetWindowBounds(
       std::unique_ptr<browser::SetWindowBoundsResult> result) {
-    GetWindowBounds(base::Bind(
+    GetWindowBounds(base::BindOnce(
         &HeadlessDevToolsClientChangeWindowBoundsTest::OnGetWindowBounds,
         base::Unretained(this)));
   }
@@ -185,14 +185,14 @@ class HeadlessDevToolsClientChangeWindowStateTest
   void RunDevTooledTest() override {
     SetWindowState(
         state_,
-        base::Bind(
+        base::BindOnce(
             &HeadlessDevToolsClientChangeWindowStateTest::OnSetWindowState,
             base::Unretained(this)));
   }
 
   void OnSetWindowState(
       std::unique_ptr<browser::SetWindowBoundsResult> result) {
-    GetWindowBounds(base::Bind(
+    GetWindowBounds(base::BindOnce(
         &HeadlessDevToolsClientChangeWindowStateTest::OnGetWindowState,
         base::Unretained(this)));
   }

headless/test/headless_browser_test.cc

@@ -44,7 +44,7 @@ class SynchronousLoadObserver {
     web_contents_->GetDevToolsTarget()->AttachClient(devtools_client_.get());
     load_observer_.reset(new LoadObserver(
         devtools_client_.get(),
-        base::Bind(&HeadlessBrowserTest::FinishAsynchronousTest,
+        base::BindOnce(&HeadlessBrowserTest::FinishAsynchronousTest,
                        base::Unretained(browser_test))));
   }