Covert base::Bind in ios/net to use base::BindOnce and base::BindRepeating.

This is part of the base::Callback migration.

Context: https://cs.chromium.org/chromium/src/docs/callback.md?rcl=9fcc3764aea8f97e9f6de4a9ee61d554e67edcda&l=40


Bug: 1007794
Change-Id: Id473723248de78393f0b2790f518392b86fcedb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500181
Commit-Queue: David Roger <droger@chromium.org>
Auto-Submit: Renjie Tang <renjietang@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821136}

ios/net/cookies/cookie_store_ios.h

@@ -198,7 +198,7 @@ class CookieStoreIOS : public net::CookieStore,
   std::unique_ptr<net::CookieMonster> cookie_monster_;
   std::unique_ptr<SystemCookieStore> system_store_;
   bool metrics_enabled_;
-  base::CancelableClosure flush_closure_;
+  base::CancelableOnceClosure flush_closure_;
 
   // Cookie notification methods.
   // The cookie cache is updated from both the system store and the

ios/net/cookies/cookie_store_ios.mm

@@ -518,8 +518,9 @@ void CookieStoreIOS::OnSystemCookiesChanged() {
   if (!flush_closure_.IsCancelled())
     return;
 
-  flush_closure_.Reset(base::Bind(&CookieStoreIOS::FlushStore,
-                                  weak_factory_.GetWeakPtr(), base::Closure()));
+  flush_closure_.Reset(base::BindOnce(&CookieStoreIOS::FlushStore,
+                                      weak_factory_.GetWeakPtr(),
+                                      base::OnceClosure()));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, flush_closure_.callback(), base::TimeDelta::FromSeconds(10));
 }

ios/net/cookies/cookie_store_ios_unittest.mm

@@ -346,8 +346,8 @@ TEST_F(CookieStoreIOSTest, GetAllCookies) {
   GetAllCookiesHelperCallback callback;
   cookie_store->GetCookieListWithOptionsAsync(
       kTestCookieURLFooBar, net::CookieOptions::MakeAllInclusive(),
-      base::Bind(&GetAllCookiesHelperCallback::Run,
-                 base::Unretained(&callback)));
+      base::BindOnce(&GetAllCookiesHelperCallback::Run,
+                     base::Unretained(&callback)));
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ(1u, callback.cookie_list().size());
@@ -382,7 +382,7 @@ TEST_F(CookieStoreIOSTest, NotifyOnAdd) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBar, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, &removes));
+          base::BindRepeating(&RecordCookieChanges, &cookies, &removes));
   EXPECT_EQ(0U, cookies.size());
   EXPECT_EQ(0U, removes.size());
   SetSystemCookie(kTestCookieURLFooBar, "abc", "def");
@@ -406,7 +406,7 @@ TEST_F(CookieStoreIOSTest, NotifyOnChange) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBar, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, &removes));
+          base::BindRepeating(&RecordCookieChanges, &cookies, &removes));
   EXPECT_EQ(0U, cookies.size());
   SetSystemCookie(kTestCookieURLFooBar, "abc", "def");
   EXPECT_EQ(1U, cookies.size());
@@ -430,7 +430,7 @@ TEST_F(CookieStoreIOSTest, NotifyOnDelete) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBar, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, &removes));
+          base::BindRepeating(&RecordCookieChanges, &cookies, &removes));
   EXPECT_EQ(0U, cookies.size());
   DeleteSystemCookie(kTestCookieURLFooBar, "abc");
   EXPECT_EQ(1U, cookies.size());
@@ -448,7 +448,7 @@ TEST_F(CookieStoreIOSTest, NoNotifyOnNoChange) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBar, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies, nullptr));
   EXPECT_EQ(0U, cookies.size());
   SetSystemCookie(kTestCookieURLFooBar, "abc", "def");
   EXPECT_EQ(1U, cookies.size());
@@ -465,19 +465,19 @@ TEST_F(CookieStoreIOSTest, MultipleNotifies) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBar, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies, nullptr));
   std::unique_ptr<net::CookieChangeSubscription> handle2 =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBaz, "abc",
-          base::Bind(&RecordCookieChanges, &cookies2, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies2, nullptr));
   std::unique_ptr<net::CookieChangeSubscription> handle3 =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFoo, "abc",
-          base::Bind(&RecordCookieChanges, &cookies3, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies3, nullptr));
   std::unique_ptr<net::CookieChangeSubscription> handle4 =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLBarBar, "abc",
-          base::Bind(&RecordCookieChanges, &cookies4, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies4, nullptr));
   SetSystemCookie(kTestCookieURLFooBar, "abc", "def");
   SetSystemCookie(kTestCookieURLFooBaz, "abc", "def");
   SetSystemCookie(kTestCookieURLFoo, "abc", "def");
@@ -498,7 +498,7 @@ TEST_F(CookieStoreIOSTest, LessSpecificNestedCookie) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBaz, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies, nullptr));
   EXPECT_EQ(0U, cookies.size());
   SetSystemCookie(kTestCookieURLFoo, "abc", "ghi");
   EXPECT_EQ(1U, cookies.size());
@@ -511,7 +511,7 @@ TEST_F(CookieStoreIOSTest, MoreSpecificNestedCookie) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBaz, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies, nullptr));
   EXPECT_EQ(0U, cookies.size());
   SetSystemCookie(kTestCookieURLFooBaz, "abc", "ghi");
   EXPECT_EQ(1U, cookies.size());
@@ -524,7 +524,7 @@ TEST_F(CookieStoreIOSTest, MoreSpecificNestedCookieWithSameValue) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBaz, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies, nullptr));
   EXPECT_EQ(0U, cookies.size());
   SetSystemCookie(kTestCookieURLFooBaz, "abc", "def");
   EXPECT_EQ(1U, cookies.size());
@@ -537,7 +537,7 @@ TEST_F(CookieStoreIOSTest, RemoveCallback) {
   std::unique_ptr<net::CookieChangeSubscription> handle =
       store_->GetChangeDispatcher().AddCallbackForCookie(
           kTestCookieURLFooBar, "abc",
-          base::Bind(&RecordCookieChanges, &cookies, nullptr));
+          base::BindRepeating(&RecordCookieChanges, &cookies, nullptr));
   EXPECT_EQ(0U, cookies.size());
   SetSystemCookie(kTestCookieURLFooBar, "abc", "ghi");
   EXPECT_EQ(2U, cookies.size());