Convert base::Bind to base::Bind{Once,Repeating} in content/browser

This CL converts base::Bind to BindOnce or BindRepeating, and also changes
relevant base::Callbacks or base::Closures to appropriate types.

This CL is split from https://crrev.com/c/1831621.

This CL was uploaded by git cl split.

R=skyostil@chromium.org

Bug: 1007760
Change-Id: I2cc2eb477f0ade0df21c17e967065768537af950
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849547
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Auto-Submit: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705987}

content/browser/android/background_sync_network_observer_android.cc

@@ -69,9 +69,9 @@ BackgroundSyncNetworkObserverAndroid::BackgroundSyncNetworkObserverAndroid(
     : BackgroundSyncNetworkObserver(network_changed_callback) {
   DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
 
-  observer_ = Observer::Create(
-      base::Bind(&BackgroundSyncNetworkObserverAndroid::OnConnectionChanged,
-                 weak_ptr_factory_.GetWeakPtr()));
+  observer_ = Observer::Create(base::BindRepeating(
+      &BackgroundSyncNetworkObserverAndroid::OnConnectionChanged,
+      weak_ptr_factory_.GetWeakPtr()));
 }
 
 BackgroundSyncNetworkObserverAndroid::~BackgroundSyncNetworkObserverAndroid() {

content/browser/android/scoped_surface_request_manager.cc

@@ -21,14 +21,15 @@ ScopedSurfaceRequestManager* ScopedSurfaceRequestManager::GetInstance() {
 
 base::UnguessableToken
 ScopedSurfaceRequestManager::RegisterScopedSurfaceRequest(
-    const ScopedSurfaceRequestCB& request_cb) {
+    ScopedSurfaceRequestCB request_cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!request_cb.is_null());
 
   base::UnguessableToken request_token = base::UnguessableToken::Create();
 
   DCHECK(!request_callbacks_.count(request_token));
-  request_callbacks_.insert(std::make_pair(request_token, request_cb));
+  request_callbacks_.insert(
+      std::make_pair(request_token, std::move(request_cb)));
 
   return request_token;
 }
@@ -49,7 +50,7 @@ ScopedSurfaceRequestManager::GetAndUnregisterInternal(
 
   auto it = request_callbacks_.find(request_token);
   if (it != request_callbacks_.end()) {
-    request = it->second;
+    request = std::move(it->second);
     request_callbacks_.erase(it);
   }
 
@@ -84,7 +85,7 @@ void ScopedSurfaceRequestManager::CompleteRequestOnUiThread(
       GetAndUnregisterInternal(request_token);
 
   if (!request.is_null())
-    request.Run(std::move(surface));
+    std::move(request).Run(std::move(surface));
 }
 
 ScopedSurfaceRequestManager::ScopedSurfaceRequestManager() {}

content/browser/android/scoped_surface_request_manager.h

@@ -21,7 +21,8 @@ class CONTENT_EXPORT ScopedSurfaceRequestManager
  public:
   static ScopedSurfaceRequestManager* GetInstance();
 
-  using ScopedSurfaceRequestCB = base::Callback<void(gl::ScopedJavaSurface)>;
+  using ScopedSurfaceRequestCB =
+      base::OnceCallback<void(gl::ScopedJavaSurface)>;
 
   // Registers a request, and returns the |request_token| that should be used to
   // call Fulfill at a later time. The caller is responsible for unregistering
@@ -30,7 +31,7 @@ class CONTENT_EXPORT ScopedSurfaceRequestManager
   // ScopedJavaSurface (as passing an empty surface is a valid operation).
   // Must be called on the UI thread.
   base::UnguessableToken RegisterScopedSurfaceRequest(
-      const ScopedSurfaceRequestCB& request_cb);
+      ScopedSurfaceRequestCB request_cb);
 
   // Unregisters a request registered under |request_token| if it exists,
   // no-ops otherwise.

content/browser/android/scoped_surface_request_manager_unittest.cc

@@ -29,12 +29,16 @@ class ScopedSurfaceRequestManagerUnitTest : public testing::Test {
 
     mock_texture_owner = base::MakeRefCounted<NiceMock<gpu::MockTextureOwner>>(
         0, nullptr, nullptr);
-    dummy_request_ =
-        base::Bind(&ScopedSurfaceRequestManagerUnitTest::DummyCallback,
-                   base::Unretained(this));
-    specific_logging_request_ =
-        base::Bind(&ScopedSurfaceRequestManagerUnitTest::LoggingCallback,
-                   base::Unretained(this), kSpecificCallbackId);
+  }
+
+  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB CreateNoopCallback() {
+    return base::BindOnce(&ScopedSurfaceRequestManagerUnitTest::DummyCallback,
+                          base::Unretained(this));
+  }
+
+  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB CreateLoggingCallback() {
+    return base::BindOnce(&ScopedSurfaceRequestManagerUnitTest::LoggingCallback,
+                          base::Unretained(this), kSpecificCallbackId);
   }
 
   // No-op callback.
@@ -46,8 +50,6 @@ class ScopedSurfaceRequestManagerUnitTest : public testing::Test {
     last_received_request_ = request_id;
   }
 
-  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB dummy_request_;
-  ScopedSurfaceRequestManager::ScopedSurfaceRequestCB specific_logging_request_;
   scoped_refptr<NiceMock<gpu::MockTextureOwner>> mock_texture_owner;
 
   int last_received_request_;
@@ -66,7 +68,7 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest, RegisterRequest_ShouldSucceed) {
   EXPECT_EQ(0, manager_->request_count_for_testing());
 
   base::UnguessableToken token =
-      manager_->RegisterScopedSurfaceRequest(dummy_request_);
+      manager_->RegisterScopedSurfaceRequest(CreateNoopCallback());
 
   EXPECT_EQ(1, manager_->request_count_for_testing());
   EXPECT_FALSE(token.is_empty());
@@ -77,9 +79,9 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest, RegisterRequest_ShouldSucceed) {
 TEST_F(ScopedSurfaceRequestManagerUnitTest,
        RegisterMultipleRequests_ShouldSucceed) {
   base::UnguessableToken token1 =
-      manager_->RegisterScopedSurfaceRequest(dummy_request_);
+      manager_->RegisterScopedSurfaceRequest(CreateNoopCallback());
   base::UnguessableToken token2 =
-      manager_->RegisterScopedSurfaceRequest(dummy_request_);
+      manager_->RegisterScopedSurfaceRequest(CreateNoopCallback());
 
   EXPECT_EQ(2, manager_->request_count_for_testing());
   EXPECT_NE(token1, token2);
@@ -94,7 +96,7 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest, VerifySingleton_ShouldSucceed) {
 TEST_F(ScopedSurfaceRequestManagerUnitTest,
        GetRegisteredRequest_ShouldSucceed) {
   base::UnguessableToken token =
-      manager_->RegisterScopedSurfaceRequest(dummy_request_);
+      manager_->RegisterScopedSurfaceRequest(CreateNoopCallback());
   EXPECT_EQ(1, manager_->request_count_for_testing());
 
   manager_->UnregisterScopedSurfaceRequest(token);
@@ -106,8 +108,8 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest,
 TEST_F(ScopedSurfaceRequestManagerUnitTest,
        GetRegisteredRequestFromMultipleRequests_ShouldSucceed) {
   base::UnguessableToken token =
-      manager_->RegisterScopedSurfaceRequest(dummy_request_);
-  manager_->RegisterScopedSurfaceRequest(dummy_request_);
+      manager_->RegisterScopedSurfaceRequest(CreateNoopCallback());
+  manager_->RegisterScopedSurfaceRequest(CreateNoopCallback());
   EXPECT_EQ(2, manager_->request_count_for_testing());
 
   manager_->UnregisterScopedSurfaceRequest(token);
@@ -128,7 +130,7 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest,
 // other registered callbacks.
 TEST_F(ScopedSurfaceRequestManagerUnitTest,
        GetUnregisteredRequestFromMultipleRequests_ShouldReturnNullCallback) {
-  manager_->RegisterScopedSurfaceRequest(dummy_request_);
+  manager_->RegisterScopedSurfaceRequest(CreateNoopCallback());
 
   manager_->UnregisterScopedSurfaceRequest(dummy_token_);
 
@@ -139,7 +141,7 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest,
 // does nothing, and does not affect other callbacks.
 TEST_F(ScopedSurfaceRequestManagerUnitTest,
        FulfillUnregisteredRequest_ShouldDoNothing) {
-  manager_->RegisterScopedSurfaceRequest(specific_logging_request_);
+  manager_->RegisterScopedSurfaceRequest(CreateLoggingCallback());
 
   manager_->FulfillScopedSurfaceRequest(
       dummy_token_, mock_texture_owner->CreateJavaSurface());
@@ -153,12 +155,12 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest,
 TEST_F(ScopedSurfaceRequestManagerUnitTest,
        FulfillRegisteredRequest_ShouldSucceed) {
   base::UnguessableToken specific_token =
-      manager_->RegisterScopedSurfaceRequest(specific_logging_request_);
+      manager_->RegisterScopedSurfaceRequest(CreateLoggingCallback());
 
   const uint64_t kOtherCallbackId = 5678;
   manager_->RegisterScopedSurfaceRequest(
-      base::Bind(&ScopedSurfaceRequestManagerUnitTest::LoggingCallback,
-                 base::Unretained(this), kOtherCallbackId));
+      base::BindOnce(&ScopedSurfaceRequestManagerUnitTest::LoggingCallback,
+                     base::Unretained(this), kOtherCallbackId));
 
   manager_->FulfillScopedSurfaceRequest(
       specific_token, mock_texture_owner->CreateJavaSurface());
@@ -174,7 +176,7 @@ TEST_F(ScopedSurfaceRequestManagerUnitTest,
 TEST_F(ScopedSurfaceRequestManagerUnitTest,
        ForwardSurfaceOwner_ShouldFulfillRequest) {
   base::UnguessableToken token =
-      manager_->RegisterScopedSurfaceRequest(specific_logging_request_);
+      manager_->RegisterScopedSurfaceRequest(CreateLoggingCallback());
 
   manager_->ForwardSurfaceOwnerForSurfaceRequest(token,
                                                  mock_texture_owner.get());

content/browser/android/text_suggestion_host_android.cc

@@ -40,17 +40,16 @@ void TextSuggestionHostAndroid::Create(JNIEnv* env, WebContents* web_contents) {
   text_suggestion_host->Initialize();
 }
 
-TextSuggestionHostAndroid::TextSuggestionHostAndroid(
-    JNIEnv* env,
-    WebContents* web_contents)
+TextSuggestionHostAndroid::TextSuggestionHostAndroid(JNIEnv* env,
+                                                     WebContents* web_contents)
     : RenderWidgetHostConnector(web_contents),
       WebContentsObserver(web_contents),
       rwhva_(nullptr),
-      suggestion_menu_timeout_(
-          base::Bind(&TextSuggestionHostAndroid::OnSuggestionMenuTimeout,
-                     base::Unretained(this))) {
-  registry_.AddInterface(base::Bind(&TextSuggestionHostMojoImplAndroid::Create,
-                                    base::Unretained(this)));
+      suggestion_menu_timeout_(base::BindRepeating(
+          &TextSuggestionHostAndroid::OnSuggestionMenuTimeout,
+          base::Unretained(this))) {
+  registry_.AddInterface(base::BindRepeating(
+      &TextSuggestionHostMojoImplAndroid::Create, base::Unretained(this)));
 }
 
 TextSuggestionHostAndroid::~TextSuggestionHostAndroid() {