Migrate from base::MakeUnique to std::make_unique.
base::MakeUnique is being deprecated as we can now use std::make_unique
when compiling code in the C++14 mode.
BUG=chromium:769107
TEST=Run unit tests.
Change-Id: If089511f90627af68fdb895be7ef079d059dbca3
Reviewed-on: https://chromium-review.googlesource.com/734423
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
diff --git a/attestation/common/tpm_utility_v2.cc b/attestation/common/tpm_utility_v2.cc
index 6e2a949..c666e61 100644
--- a/attestation/common/tpm_utility_v2.cc
+++ b/attestation/common/tpm_utility_v2.cc
@@ -16,8 +16,9 @@
#include "attestation/common/tpm_utility_v2.h"
+#include <memory>
+
#include <base/logging.h>
-#include <base/memory/ptr_util.h>
#include <brillo/bind_lambda.h>
#include <crypto/scoped_openssl_types.h>
#include <crypto/sha2.h>
@@ -184,9 +185,9 @@
tpm_manager_thread_.task_runner()->PostTask(
FROM_HERE, base::Bind([this, &event]() {
default_tpm_owner_ =
- base::MakeUnique<tpm_manager::TpmOwnershipDBusProxy>();
+ std::make_unique<tpm_manager::TpmOwnershipDBusProxy>();
default_tpm_nvram_ =
- base::MakeUnique<tpm_manager::TpmNvramDBusProxy>();
+ std::make_unique<tpm_manager::TpmNvramDBusProxy>();
if (default_tpm_owner_->Initialize()) {
tpm_owner_ = default_tpm_owner_.get();
}
@@ -202,7 +203,7 @@
return false;
}
if (!trunks_factory_) {
- default_trunks_factory_ = base::MakeUnique<trunks::TrunksFactoryImpl>();
+ default_trunks_factory_ = std::make_unique<trunks::TrunksFactoryImpl>();
if (!default_trunks_factory_->Initialize()) {
LOG(ERROR) << "Failed to initialize trunks.";
return false;
diff --git a/tpm_manager/client/main.cc b/tpm_manager/client/main.cc
index 9e2cd6a..3ae332c 100644
--- a/tpm_manager/client/main.cc
+++ b/tpm_manager/client/main.cc
@@ -24,7 +24,6 @@
#include <base/command_line.h>
#include <base/files/file_util.h>
#include <base/logging.h>
-#include <base/memory/ptr_util.h>
#include <base/message_loop/message_loop.h>
#include <brillo/bind_lambda.h>
#if defined(USE_BINDER_IPC)
@@ -176,14 +175,14 @@
return EX_UNAVAILABLE;
}
std::unique_ptr<TpmNvramBinderProxy> nvram_proxy =
- base::MakeUnique<TpmNvramBinderProxy>();
+ std::make_unique<TpmNvramBinderProxy>();
std::unique_ptr<TpmOwnershipBinderProxy> ownership_proxy =
- base::MakeUnique<TpmOwnershipBinderProxy>();
+ std::make_unique<TpmOwnershipBinderProxy>();
#else
std::unique_ptr<TpmNvramDBusProxy> nvram_proxy =
- base::MakeUnique<TpmNvramDBusProxy>();
+ std::make_unique<TpmNvramDBusProxy>();
std::unique_ptr<TpmOwnershipDBusProxy> ownership_proxy =
- base::MakeUnique<TpmOwnershipDBusProxy>();
+ std::make_unique<TpmOwnershipDBusProxy>();
#endif
if (!nvram_proxy->Initialize()) {
LOG(ERROR) << "Error initializing nvram proxy.";
diff --git a/tpm_manager/server/tpm_manager_service.cc b/tpm_manager/server/tpm_manager_service.cc
index c660e53..8a93732 100644
--- a/tpm_manager/server/tpm_manager_service.cc
+++ b/tpm_manager/server/tpm_manager_service.cc
@@ -16,6 +16,8 @@
#include "tpm_manager/server/tpm_manager_service.h"
+#include <memory>
+
#include <base/callback.h>
#include <base/command_line.h>
#include <brillo/bind_lambda.h>
@@ -85,22 +87,22 @@
}
local_data_store_ = &default_local_data_store_;
default_tpm_status_ =
- base::MakeUnique<Tpm2StatusImpl>(default_trunks_factory_);
+ std::make_unique<Tpm2StatusImpl>(default_trunks_factory_);
tpm_status_ = default_tpm_status_.get();
- default_tpm_initializer_ = base::MakeUnique<Tpm2InitializerImpl>(
+ default_tpm_initializer_ = std::make_unique<Tpm2InitializerImpl>(
default_trunks_factory_, local_data_store_, tpm_status_);
tpm_initializer_ = default_tpm_initializer_.get();
- default_tpm_nvram_ = base::MakeUnique<Tpm2NvramImpl>(
+ default_tpm_nvram_ = std::make_unique<Tpm2NvramImpl>(
default_trunks_factory_, local_data_store_);
tpm_nvram_ = default_tpm_nvram_.get();
#else
default_tpm_status_ =
- base::MakeUnique<TpmStatusImpl>();
+ std::make_unique<TpmStatusImpl>();
tpm_status_ = default_tpm_status_.get();
default_tpm_initializer_ =
- base::MakeUnique<TpmInitializerImpl>(local_data_store_, tpm_status_);
+ std::make_unique<TpmInitializerImpl>(local_data_store_, tpm_status_);
tpm_initializer_ = default_tpm_initializer_.get();
- default_tpm_nvram_ = base::MakeUnique<TpmNvramImpl>(local_data_store_);
+ default_tpm_nvram_ = std::make_unique<TpmNvramImpl>(local_data_store_);
tpm_nvram_ = default_tpm_nvram_.get();
#endif
}
diff --git a/trunks/trunks_factory_for_test.cc b/trunks/trunks_factory_for_test.cc
index ccedab5..915039f 100644
--- a/trunks/trunks_factory_for_test.cc
+++ b/trunks/trunks_factory_for_test.cc
@@ -18,7 +18,6 @@
#include <memory>
-#include <base/memory/ptr_util.h>
#include <gmock/gmock.h>
#include "trunks/authorization_delegate.h"
@@ -624,39 +623,39 @@
}
std::unique_ptr<TpmState> TrunksFactoryForTest::GetTpmState() const {
- return base::MakeUnique<TpmStateForwarder>(tpm_state_);
+ return std::make_unique<TpmStateForwarder>(tpm_state_);
}
std::unique_ptr<TpmUtility> TrunksFactoryForTest::GetTpmUtility() const {
- return base::MakeUnique<TpmUtilityForwarder>(tpm_utility_);
+ return std::make_unique<TpmUtilityForwarder>(tpm_utility_);
}
std::unique_ptr<AuthorizationDelegate>
TrunksFactoryForTest::GetPasswordAuthorization(
const std::string& password) const {
- return base::MakeUnique<AuthorizationDelegateForwarder>(
+ return std::make_unique<AuthorizationDelegateForwarder>(
password_authorization_delegate_);
}
std::unique_ptr<SessionManager> TrunksFactoryForTest::GetSessionManager()
const {
- return base::MakeUnique<SessionManagerForwarder>(session_manager_);
+ return std::make_unique<SessionManagerForwarder>(session_manager_);
}
std::unique_ptr<HmacSession> TrunksFactoryForTest::GetHmacSession() const {
- return base::MakeUnique<HmacSessionForwarder>(hmac_session_);
+ return std::make_unique<HmacSessionForwarder>(hmac_session_);
}
std::unique_ptr<PolicySession> TrunksFactoryForTest::GetPolicySession() const {
- return base::MakeUnique<PolicySessionForwarder>(policy_session_);
+ return std::make_unique<PolicySessionForwarder>(policy_session_);
}
std::unique_ptr<PolicySession> TrunksFactoryForTest::GetTrialSession() const {
- return base::MakeUnique<PolicySessionForwarder>(trial_session_);
+ return std::make_unique<PolicySessionForwarder>(trial_session_);
}
std::unique_ptr<BlobParser> TrunksFactoryForTest::GetBlobParser() const {
- return base::MakeUnique<BlobParserForwarder>(blob_parser_);
+ return std::make_unique<BlobParserForwarder>(blob_parser_);
}
} // namespace trunks
diff --git a/trunks/trunks_factory_impl.cc b/trunks/trunks_factory_impl.cc
index 9b07d55..a11c1f0 100644
--- a/trunks/trunks_factory_impl.cc
+++ b/trunks/trunks_factory_impl.cc
@@ -16,8 +16,9 @@
#include "trunks/trunks_factory_impl.h"
+#include <memory>
+
#include <base/logging.h>
-#include <base/memory/ptr_util.h>
#include "trunks/blob_parser.h"
#include "trunks/error_codes.h"
@@ -175,36 +176,36 @@
}
std::unique_ptr<TpmState> TrunksFactoryImpl::GetTpmState() const {
- return base::MakeUnique<TpmStateImpl>(*this);
+ return std::make_unique<TpmStateImpl>(*this);
}
std::unique_ptr<TpmUtility> TrunksFactoryImpl::GetTpmUtility() const {
- return base::MakeUnique<TpmUtilityImpl>(*this);
+ return std::make_unique<TpmUtilityImpl>(*this);
}
std::unique_ptr<AuthorizationDelegate>
TrunksFactoryImpl::GetPasswordAuthorization(const std::string& password) const {
- return base::MakeUnique<PasswordAuthorizationDelegate>(password);
+ return std::make_unique<PasswordAuthorizationDelegate>(password);
}
std::unique_ptr<SessionManager> TrunksFactoryImpl::GetSessionManager() const {
- return base::MakeUnique<SessionManagerImpl>(*this);
+ return std::make_unique<SessionManagerImpl>(*this);
}
std::unique_ptr<HmacSession> TrunksFactoryImpl::GetHmacSession() const {
- return base::MakeUnique<HmacSessionImpl>(*this);
+ return std::make_unique<HmacSessionImpl>(*this);
}
std::unique_ptr<PolicySession> TrunksFactoryImpl::GetPolicySession() const {
- return base::MakeUnique<PolicySessionImpl>(*this, TPM_SE_POLICY);
+ return std::make_unique<PolicySessionImpl>(*this, TPM_SE_POLICY);
}
std::unique_ptr<PolicySession> TrunksFactoryImpl::GetTrialSession() const {
- return base::MakeUnique<PolicySessionImpl>(*this, TPM_SE_TRIAL);
+ return std::make_unique<PolicySessionImpl>(*this, TPM_SE_TRIAL);
}
std::unique_ptr<BlobParser> TrunksFactoryImpl::GetBlobParser() const {
- return base::MakeUnique<BlobParser>();
+ return std::make_unique<BlobParser>();
}
void TrunksFactoryImpl::set_max_command_retries(int max_command_retries) {
