Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
index a868f30cebc739707c1cd03dc29d1075fe8f8b1d..cb7cd91d6a97d86ce7ad58e0a0ebb636938b48e1 100644
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
@@ -207,14 +207,14 @@ class EasyUnlockTpmKeyManagerTest : public testing::Test {
signin_profile_ = profile_manager_.CreateTestingProfile(
chrome::kInitialProfile,
- scoped_ptr<syncable_prefs::TestingPrefServiceSyncable>(),
+ std::unique_ptr<syncable_prefs::TestingPrefServiceSyncable>(),
base::UTF8ToUTF16(chrome::kInitialProfile), 0 /* avatar id */,
std::string() /* supervized user id */,
TestingProfile::TestingFactories());
user_profile_ = profile_manager_.CreateTestingProfile(
test_account_id_.GetUserEmail(),
- scoped_ptr<syncable_prefs::TestingPrefServiceSyncable>(),
+ std::unique_ptr<syncable_prefs::TestingPrefServiceSyncable>(),
base::UTF8ToUTF16(test_account_id_.GetUserEmail()), 0 /* avatar id */,
std::string() /* supervized user id */,
TestingProfile::TestingFactories());
@@ -339,8 +339,8 @@ class EasyUnlockTpmKeyManagerTest : public testing::Test {
content::TestBrowserThreadBundle thread_bundle_;
// The NSS system slot used by EasyUnlockTPMKeyManagers in tests.
- scoped_ptr<crypto::ScopedTestSystemNSSKeySlot> test_system_slot_;
- scoped_ptr<crypto::ScopedTestNSSChromeOSUser> test_nss_user_;
+ std::unique_ptr<crypto::ScopedTestSystemNSSKeySlot> test_system_slot_;
+ std::unique_ptr<crypto::ScopedTestNSSChromeOSUser> test_nss_user_;
// Needed to properly set up signin and user profiles for test.
user_manager::FakeUserManager* user_manager_;

Powered by Google App Engine
This is Rietveld 408576698