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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/password_manager/core/browser/password_store_unittest.cc

Issue 1852093002: components/password_manager: scoped_ptr -> unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and revert an accidental .proto change Created 4 years, 9 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
« no previous file with comments | « components/password_manager/core/browser/password_store_origin_unittest.h ('k') | components/password_manager/core/browser/password_syncable_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/password_manager/core/browser/password_store_unittest.cc
diff --git a/components/password_manager/core/browser/password_store_unittest.cc b/components/password_manager/core/browser/password_store_unittest.cc
index 4d0363fc9690f351109991ace5419b0fd5c2b4ed..9daa18b0586e4f80dadb2b00b97e04ca2e2d7a4a 100644
--- a/components/password_manager/core/browser/password_store_unittest.cc
+++ b/components/password_manager/core/browser/password_store_unittest.cc
@@ -8,11 +8,13 @@
// passwords. This will not be needed anymore if crbug.com/466638 is fixed.
#include <stddef.h>
+
#include <utility>
#include "base/bind.h"
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -105,7 +107,7 @@ ACTION(STLDeleteElements0) {
TEST_F(PasswordStoreTest, IgnoreOldWwwGoogleLogins) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
const time_t cutoff = 1325376000; // 00:00 Jan 1 2012 UTC
@@ -228,7 +230,7 @@ TEST_F(PasswordStoreTest, IgnoreOldWwwGoogleLogins) {
TEST_F(PasswordStoreTest, StartSyncFlare) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
StartSyncFlareMock mock;
store->Init(
base::Bind(&StartSyncFlareMock::StartSyncFlare, base::Unretained(&mock)));
@@ -257,22 +259,27 @@ TEST_F(PasswordStoreTest, GetLoginImpl) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
// For each attribute in the primary key, create one form that mismatches on
// that attribute.
- scoped_ptr<PasswordForm> test_form(
+ std::unique_ptr<PasswordForm> test_form(
CreatePasswordFormFromDataForTesting(kTestCredential));
- scoped_ptr<PasswordForm> mismatching_form_1(new PasswordForm(*test_form));
+ std::unique_ptr<PasswordForm> mismatching_form_1(
+ new PasswordForm(*test_form));
mismatching_form_1->signon_realm = kTestPSLMatchingWebRealm;
- scoped_ptr<PasswordForm> mismatching_form_2(new PasswordForm(*test_form));
+ std::unique_ptr<PasswordForm> mismatching_form_2(
+ new PasswordForm(*test_form));
mismatching_form_2->origin = GURL(kTestPSLMatchingWebOrigin);
- scoped_ptr<PasswordForm> mismatching_form_3(new PasswordForm(*test_form));
+ std::unique_ptr<PasswordForm> mismatching_form_3(
+ new PasswordForm(*test_form));
mismatching_form_3->username_element = base::ASCIIToUTF16("other_element");
- scoped_ptr<PasswordForm> mismatching_form_4(new PasswordForm(*test_form));
+ std::unique_ptr<PasswordForm> mismatching_form_4(
+ new PasswordForm(*test_form));
mismatching_form_4->password_element = base::ASCIIToUTF16("other_element");
- scoped_ptr<PasswordForm> mismatching_form_5(new PasswordForm(*test_form));
+ std::unique_ptr<PasswordForm> mismatching_form_5(
+ new PasswordForm(*test_form));
mismatching_form_5->username_value =
base::ASCIIToUTF16("other_username_value");
@@ -286,7 +293,7 @@ TEST_F(PasswordStoreTest, GetLoginImpl) {
store->AddLogin(*test_form);
base::MessageLoop::current()->RunUntilIdle();
- scoped_ptr<PasswordForm> returned_form = store->GetLoginImpl(*test_form);
+ std::unique_ptr<PasswordForm> returned_form = store->GetLoginImpl(*test_form);
ASSERT_TRUE(returned_form);
EXPECT_EQ(*test_form, *returned_form);
@@ -315,10 +322,10 @@ TEST_F(PasswordStoreTest, UpdateLoginPrimaryKeyFields) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
- scoped_ptr<PasswordForm> old_form(
+ std::unique_ptr<PasswordForm> old_form(
CreatePasswordFormFromDataForTesting(kTestCredentials[0]));
store->AddLogin(*old_form);
base::MessageLoop::current()->RunUntilIdle();
@@ -326,7 +333,7 @@ TEST_F(PasswordStoreTest, UpdateLoginPrimaryKeyFields) {
MockPasswordStoreObserver mock_observer;
store->AddObserver(&mock_observer);
- scoped_ptr<PasswordForm> new_form(
+ std::unique_ptr<PasswordForm> new_form(
CreatePasswordFormFromDataForTesting(kTestCredentials[1]));
EXPECT_CALL(mock_observer, OnLoginsChanged(testing::SizeIs(2u)));
PasswordForm old_primary_key;
@@ -368,10 +375,10 @@ TEST_F(PasswordStoreTest, RemoveLoginsCreatedBetweenCallbackIsCalled) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
- scoped_ptr<PasswordForm> test_form(
+ std::unique_ptr<PasswordForm> test_form(
CreatePasswordFormFromDataForTesting(kTestCredential));
store->AddLogin(*test_form);
base::MessageLoop::current()->RunUntilIdle();
@@ -421,11 +428,11 @@ TEST_F(PasswordStoreTest, GetLoginsWithoutAffiliations) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
- store->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));
+ store->SetAffiliatedMatchHelper(base::WrapUnique(mock_helper));
ScopedVector<PasswordForm> all_credentials;
for (size_t i = 0; i < arraysize(kTestCredentials); ++i) {
@@ -528,11 +535,11 @@ TEST_F(PasswordStoreTest, GetLoginsWithAffiliations) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
- store->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));
+ store->SetAffiliatedMatchHelper(base::WrapUnique(mock_helper));
ScopedVector<PasswordForm> all_credentials;
for (size_t i = 0; i < arraysize(kTestCredentials); ++i) {
@@ -716,7 +723,7 @@ TEST_F(PasswordStoreTest, MAYBE_UpdatePasswordsStoredForAffiliatedWebsites) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(),
base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max(),
base::Closure());
@@ -736,7 +743,7 @@ TEST_F(PasswordStoreTest, MAYBE_UpdatePasswordsStoredForAffiliatedWebsites) {
// otherwise it will already start propagating updates as new Android
// credentials are added.
MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
- store->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));
+ store->SetAffiliatedMatchHelper(base::WrapUnique(mock_helper));
store->enable_propagating_password_changes_to_web_credentials(
propagation_enabled);
@@ -825,7 +832,7 @@ TEST_F(PasswordStoreTest, GetLoginsWithAffiliatedRealms) {
scoped_refptr<PasswordStoreDefault> store(new PasswordStoreDefault(
base::ThreadTaskRunnerHandle::Get(),
base::ThreadTaskRunnerHandle::Get(),
- make_scoped_ptr(new LoginDatabase(test_login_db_file_path()))));
+ base::WrapUnique(new LoginDatabase(test_login_db_file_path()))));
store->Init(syncer::SyncableService::StartSyncFlare());
store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max(),
base::Closure());
@@ -846,7 +853,7 @@ TEST_F(PasswordStoreTest, GetLoginsWithAffiliatedRealms) {
expected_results.push_back(new PasswordForm(*all_credentials[i]));
MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
- store->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));
+ store->SetAffiliatedMatchHelper(base::WrapUnique(mock_helper));
std::vector<std::string> affiliated_web_realms;
affiliated_web_realms.push_back(kTestWebRealm1);
« no previous file with comments | « components/password_manager/core/browser/password_store_origin_unittest.h ('k') | components/password_manager/core/browser/password_syncable_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698