Merge pull request #8524 from brave/issues/15262

Fix std::move and use of the same object in statements.
This commit is contained in:
Aleksey Khoroshilov
2021-04-14 14:04:04 +07:00
committed by GitHub
6 changed files with 18 additions and 20 deletions
@@ -213,9 +213,9 @@ bool BinanceService::OAuthRequest(const GURL &url,
default_storage_partition->GetURLLoaderFactoryForBrowserProcess().get();
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory, base::BindOnce(
&BinanceService::OnURLLoaderComplete,
base::Unretained(this), std::move(iter), std::move(callback)));
url_loader_factory,
base::BindOnce(&BinanceService::OnURLLoaderComplete,
base::Unretained(this), iter, std::move(callback)));
return true;
}
@@ -82,8 +82,7 @@ void BraveSearchHost::FetchBackupResults(const std::string& query,
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
shared_url_loader_factory_.get(),
base::BindOnce(&BraveSearchHost::OnURLLoaderComplete,
weak_factory_.GetWeakPtr(), std::move(iter),
std::move(callback)));
weak_factory_.GetWeakPtr(), iter, std::move(callback)));
}
void BraveSearchHost::OnURLLoaderComplete(
@@ -103,8 +103,7 @@ void EthJsonRpcController::Request(const std::string& json_payload,
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory,
base::BindOnce(&EthJsonRpcController::OnURLLoaderComplete,
base::Unretained(this), std::move(iter),
std::move(callback)));
base::Unretained(this), iter, std::move(callback)));
}
void EthJsonRpcController::OnURLLoaderComplete(
@@ -199,9 +199,9 @@ bool CryptoDotComService::NetworkRequest(const GURL &url,
default_storage_partition->GetURLLoaderFactoryForBrowserProcess().get();
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory, base::BindOnce(
&CryptoDotComService::OnURLLoaderComplete,
base::Unretained(this), std::move(iter), std::move(callback)));
url_loader_factory,
base::BindOnce(&CryptoDotComService::OnURLLoaderComplete,
base::Unretained(this), iter, std::move(callback)));
return true;
}
+3 -3
View File
@@ -478,9 +478,9 @@ bool GeminiService::OAuthRequest(const GURL &url,
default_storage_partition->GetURLLoaderFactoryForBrowserProcess().get();
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory, base::BindOnce(
&GeminiService::OnURLLoaderComplete,
base::Unretained(this), std::move(iter), std::move(callback)));
url_loader_factory,
base::BindOnce(&GeminiService::OnURLLoaderComplete,
base::Unretained(this), iter, std::move(callback)));
return true;
}
+7 -7
View File
@@ -293,7 +293,7 @@ void IpfsService::GetConnectedPeers(GetConnectedPeersCallback callback,
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory_.get(),
base::BindOnce(&IpfsService::OnGetConnectedPeers, base::Unretained(this),
std::move(iter), std::move(callback), retries));
iter, std::move(callback), retries));
}
base::TimeDelta IpfsService::CalculatePeersRetryTime() {
@@ -358,7 +358,7 @@ void IpfsService::GetAddressesConfig(GetAddressesConfigCallback callback) {
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory_.get(),
base::BindOnce(&IpfsService::OnGetAddressesConfig, base::Unretained(this),
std::move(iter), std::move(callback)));
iter, std::move(callback)));
}
void IpfsService::OnGetAddressesConfig(
@@ -513,8 +513,8 @@ void IpfsService::GetRepoStats(GetRepoStatsCallback callback) {
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory_.get(),
base::BindOnce(&IpfsService::OnRepoStats, base::Unretained(this),
std::move(iter), std::move(callback)));
base::BindOnce(&IpfsService::OnRepoStats, base::Unretained(this), iter,
std::move(callback)));
}
void IpfsService::OnRepoStats(SimpleURLLoaderList::iterator iter,
@@ -552,8 +552,8 @@ void IpfsService::GetNodeInfo(GetNodeInfoCallback callback) {
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory_.get(),
base::BindOnce(&IpfsService::OnNodeInfo, base::Unretained(this),
std::move(iter), std::move(callback)));
base::BindOnce(&IpfsService::OnNodeInfo, base::Unretained(this), iter,
std::move(callback)));
}
void IpfsService::OnNodeInfo(SimpleURLLoaderList::iterator iter,
@@ -593,7 +593,7 @@ void IpfsService::RunGarbageCollection(GarbageCollectionCallback callback) {
iter->get()->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
url_loader_factory_.get(),
base::BindOnce(&IpfsService::OnGarbageCollection, base::Unretained(this),
std::move(iter), std::move(callback)));
iter, std::move(callback)));
}
void IpfsService::OnGarbageCollection(