Migrating base::Callback to base::OnceCallback.

This is a follow-up on a comment in crrev.com/c/2463051. In
nss_context.cc we make GetNSSCertDatabaseForProfile take OnceCallback
instead of RepeatingCallback. This is possible, because the callback
will be used only once in GetCertDBOnIOThread. We then make all
callers use base::BindOnce.

BUG=764795
TESTED=build

Change-Id: I9120f3c4d0ff70be2dc6c146295a40cc4db17bb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2484069Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Carlos IL <carlosil@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Tomasz Tylenda <ttylenda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819690}

chrome/browser/chromeos/arc/enterprise/cert_store/arc_cert_store_bridge.cc

@@ -189,8 +189,8 @@ void ArcCertStoreBridge::ListCertificates(ListCertificatesCallback callback) {
 
   GetNSSCertDatabaseForProfile(
       Profile::FromBrowserContext(context_),
-      base::Bind(&ArcCertStoreBridge::OnGetNSSCertDatabaseForProfile,
-                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
+      base::BindOnce(&ArcCertStoreBridge::OnGetNSSCertDatabaseForProfile,
+                     weak_ptr_factory_.GetWeakPtr(), std::move(callback)));
 }
 
 void ArcCertStoreBridge::GetKeyCharacteristics(

chrome/browser/chromeos/arc/enterprise/cert_store/arc_cert_store_bridge_browsertest.cc

@@ -247,8 +247,8 @@ class ArcCertStoreBridgeTest : public MixinBasedInProcessBrowserTest {
     base::RunLoop loop;
     GetNSSCertDatabaseForProfile(
         browser()->profile(),
-        base::Bind(&ArcCertStoreBridgeTest::SetUpTestClientCerts,
-                   base::Unretained(this), loop.QuitClosure()));
+        base::BindOnce(&ArcCertStoreBridgeTest::SetUpTestClientCerts,
+                       base::Unretained(this), loop.QuitClosure()));
     loop.Run();
     // Certificates must be imported.
     ASSERT_NE(nullptr, client_cert1_);

chrome/browser/chromeos/login/session/user_session_initializer.cc

@@ -148,7 +148,7 @@ void UserSessionInitializer::InitializeCerts(Profile* profile) {
   if (NetworkCertLoader::IsInitialized() &&
       base::SysInfo::IsRunningOnChromeOS()) {
     GetNSSCertDatabaseForProfile(profile,
-                                 base::Bind(&OnGetNSSCertDatabaseForUser));
+                                 base::BindOnce(&OnGetNSSCertDatabaseForUser));
   }
 }
 

chrome/browser/chromeos/platform_keys/platform_keys_service_browsertest.cc

@@ -135,8 +135,8 @@ class PlatformKeysServiceBrowserTestBase
       base::RunLoop loop;
       GetNSSCertDatabaseForProfile(
           profile_,
-          base::BindRepeating(&PlatformKeysServiceBrowserTestBase::SetUserSlot,
-                              base::Unretained(this), loop.QuitClosure()));
+          base::BindOnce(&PlatformKeysServiceBrowserTestBase::SetUserSlot,
+                         base::Unretained(this), loop.QuitClosure()));
       loop.Run();
     }
     ASSERT_TRUE(profile_);

chrome/browser/chromeos/policy/user_network_configuration_updater.cc

@@ -130,10 +130,9 @@ void UserNetworkConfigurationUpdater::Observe(
   Profile* profile = content::Source<Profile>(source).ptr();
 
   GetNSSCertDatabaseForProfile(
-      profile, base::AdaptCallbackForRepeating(
-                   base::BindOnce(&UserNetworkConfigurationUpdater::
-                                      CreateAndSetClientCertificateImporter,
-                                  weak_factory_.GetWeakPtr())));
+      profile, base::BindOnce(&UserNetworkConfigurationUpdater::
+                                  CreateAndSetClientCertificateImporter,
+                              weak_factory_.GetWeakPtr()));
 }
 
 void UserNetworkConfigurationUpdater::CreateAndSetClientCertificateImporter(

chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

@@ -255,9 +255,8 @@ IN_PROC_BROWSER_TEST_P(EnterprisePlatformKeysTest, Basic) {
    base::RunLoop loop;
    GetNSSCertDatabaseForProfile(
        profile(),
-       base::Bind(&EnterprisePlatformKeysTest::DidGetCertDatabase,
-                  base::Unretained(this),
-                  loop.QuitClosure()));
+       base::BindOnce(&EnterprisePlatformKeysTest::DidGetCertDatabase,
+                      base::Unretained(this), loop.QuitClosure()));
    loop.Run();
   }
   policy_test_utils::SetExtensionInstallForcelistPolicy(

chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc

@@ -76,8 +76,8 @@ class PlatformKeysTest : public PlatformKeysTestBase {
       base::RunLoop loop;
       GetNSSCertDatabaseForProfile(
           profile(),
-          base::BindRepeating(&PlatformKeysTest::SetupTestCerts,
-                              base::Unretained(this), loop.QuitClosure()));
+          base::BindOnce(&PlatformKeysTest::SetupTestCerts,
+                         base::Unretained(this), loop.QuitClosure()));
       loop.Run();
     }
 

chrome/browser/net/nss_context.cc

@@ -32,28 +32,29 @@ void DidGetCertDBOnIOThread(
 void GetCertDBOnIOThread(
     content::ResourceContext* context,
     scoped_refptr<base::SequencedTaskRunner> response_task_runner,
-    const base::RepeatingCallback<void(net::NSSCertDatabase*)>& callback) {
+    base::OnceCallback<void(net::NSSCertDatabase*)> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Note that the callback will be used only if the cert database hasn't yet
   // been initialized.
-  net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
-      context,
-      base::BindOnce(&DidGetCertDBOnIOThread, response_task_runner, callback));
+  auto completion_callback = base::AdaptCallbackForRepeating(base::BindOnce(
+      &DidGetCertDBOnIOThread, response_task_runner, std::move(callback)));
+  net::NSSCertDatabase* cert_db =
+      GetNSSCertDatabaseForResourceContext(context, completion_callback);
 
   if (cert_db)
-    DidGetCertDBOnIOThread(response_task_runner, callback, cert_db);
+    completion_callback.Run(cert_db);
 }
 
 }  // namespace
 
 void GetNSSCertDatabaseForProfile(
     Profile* profile,
-    const base::RepeatingCallback<void(net::NSSCertDatabase*)>& callback) {
+    base::OnceCallback<void(net::NSSCertDatabase*)> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   content::GetIOThreadTaskRunner({})->PostTask(
       FROM_HERE,
       base::BindOnce(&GetCertDBOnIOThread, profile->GetResourceContext(),
-                     base::ThreadTaskRunnerHandle::Get(), callback));
+                     base::ThreadTaskRunnerHandle::Get(), std::move(callback)));
 }

chrome/browser/net/nss_context.h

@@ -48,6 +48,6 @@ void EnableNSSSystemKeySlotForResourceContext(
 // It's accessing profile, so it should be called on the UI thread.
 void GetNSSCertDatabaseForProfile(
     Profile* profile,
-    const base::RepeatingCallback<void(net::NSSCertDatabase*)>& callback);
+    base::OnceCallback<void(net::NSSCertDatabase*)> callback);
 
 #endif  // CHROME_BROWSER_NET_NSS_CONTEXT_H_

chrome/browser/ssl/ssl_browsertest.cc

@@ -1998,8 +1998,8 @@ class SSLUITestWithClientCert : public SSLUITestBase {
     base::RunLoop loop;
     GetNSSCertDatabaseForProfile(
         browser()->profile(),
-        base::Bind(&SSLUITestWithClientCert::DidGetCertDatabase,
-                   base::Unretained(this), &loop));
+        base::BindOnce(&SSLUITestWithClientCert::DidGetCertDatabase,
+                       base::Unretained(this), &loop));
     loop.Run();
   }
 
@@ -5873,8 +5873,8 @@ class SSLUITestCustomCACerts : public SSLUITestNoCert {
       base::RunLoop loop;
       GetNSSCertDatabaseForProfile(
           profile_1_,
-          base::Bind(&SSLUITestCustomCACerts::DidGetCertDatabase,
-                     base::Unretained(this), &loop, &profile_1_cert_db_));
+          base::BindOnce(&SSLUITestCustomCACerts::DidGetCertDatabase,
+                         base::Unretained(this), &loop, &profile_1_cert_db_));
       loop.Run();
     }
 
@@ -5882,8 +5882,8 @@ class SSLUITestCustomCACerts : public SSLUITestNoCert {
       base::RunLoop loop;
       GetNSSCertDatabaseForProfile(
           profile_2_,
-          base::Bind(&SSLUITestCustomCACerts::DidGetCertDatabase,
-                     base::Unretained(this), &loop, &profile_2_cert_db_));
+          base::BindOnce(&SSLUITestCustomCACerts::DidGetCertDatabase,
+                         base::Unretained(this), &loop, &profile_2_cert_db_));
       loop.Run();
     }
 

chrome/browser/ui/webui/chromeos/onc_import_message_handler.cc

@@ -48,8 +48,8 @@ void OncImportMessageHandler::OnImportONC(const base::ListValue* list) {
   AllowJavascript();
   GetNSSCertDatabaseForProfile(
       Profile::FromWebUI(web_ui()),
-      base::Bind(&OncImportMessageHandler::ImportONCToNSSDB,
-                 weak_factory_.GetWeakPtr(), callback_id, onc_blob));
+      base::BindOnce(&OncImportMessageHandler::ImportONCToNSSDB,
+                     weak_factory_.GetWeakPtr(), callback_id, onc_blob));
 }
 
 void OncImportMessageHandler::ImportONCToNSSDB(const std::string& callback_id,