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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui 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
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_ui_controller.cc ('k') | chrome/browser/ui/passwords/password_bubble_experiment_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index f9e132f71dcfc369155feb741e9e26dec7061f0e..0e573191da7f1b910f6ad4849be52f837c406204 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
#include <utility>
#include <vector>
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -165,12 +166,12 @@ class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
void ExpectIconStateIs(password_manager::ui::State state);
void ExpectIconAndControllerStateIs(password_manager::ui::State state);
- scoped_ptr<password_manager::PasswordFormManager>
+ std::unique_ptr<password_manager::PasswordFormManager>
CreateFormManagerWithBestMatches(
const autofill::PasswordForm& observed_form,
ScopedVector<autofill::PasswordForm> best_matches);
- scoped_ptr<password_manager::PasswordFormManager> CreateFormManager();
+ std::unique_ptr<password_manager::PasswordFormManager> CreateFormManager();
// Tests that the state is not changed when the password is autofilled.
void TestNotChangingStateOnAutofill(
@@ -224,11 +225,11 @@ void ManagePasswordsUIControllerTest::ExpectIconAndControllerStateIs(
EXPECT_EQ(state, controller()->GetState());
}
-scoped_ptr<password_manager::PasswordFormManager>
+std::unique_ptr<password_manager::PasswordFormManager>
ManagePasswordsUIControllerTest::CreateFormManagerWithBestMatches(
const autofill::PasswordForm& observed_form,
ScopedVector<autofill::PasswordForm> best_matches) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
new password_manager::PasswordFormManager(&password_manager_, &client_,
driver_.AsWeakPtr(),
observed_form, true));
@@ -237,7 +238,7 @@ ManagePasswordsUIControllerTest::CreateFormManagerWithBestMatches(
return test_form_manager;
}
-scoped_ptr<password_manager::PasswordFormManager>
+std::unique_ptr<password_manager::PasswordFormManager>
ManagePasswordsUIControllerTest::CreateFormManager() {
ScopedVector<autofill::PasswordForm> stored_forms;
stored_forms.push_back(new autofill::PasswordForm(test_local_form()));
@@ -252,7 +253,7 @@ void ManagePasswordsUIControllerTest::TestNotChangingStateOnAutofill(
state == password_manager::ui::CONFIRMATION_STATE);
// Set the bubble state to |state|.
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
test_form_manager->ProvisionallySave(
test_local_form(),
@@ -266,7 +267,7 @@ void ManagePasswordsUIControllerTest::TestNotChangingStateOnAutofill(
ASSERT_EQ(state, controller()->GetState());
// Autofill happens.
- scoped_ptr<autofill::PasswordForm> test_form(
+ std::unique_ptr<autofill::PasswordForm> test_form(
new autofill::PasswordForm(test_local_form()));
autofill::PasswordFormMap map;
map.insert(
@@ -286,7 +287,7 @@ TEST_F(ManagePasswordsUIControllerTest, DefaultState) {
}
TEST_F(ManagePasswordsUIControllerTest, PasswordAutofilled) {
- scoped_ptr<autofill::PasswordForm> test_form(
+ std::unique_ptr<autofill::PasswordForm> test_form(
new autofill::PasswordForm(test_local_form()));
autofill::PasswordForm* test_form_ptr = test_form.get();
base::string16 kTestUsername = test_form->username_value;
@@ -306,7 +307,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordAutofilled) {
}
TEST_F(ManagePasswordsUIControllerTest, PasswordSubmitted) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
test_form_manager->ProvisionallySave(
test_local_form(),
@@ -327,7 +328,7 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedFormPasswordSubmitted) {
blacklisted.blacklisted_by_user = true;
ScopedVector<autofill::PasswordForm> stored_forms;
stored_forms.push_back(new autofill::PasswordForm(blacklisted));
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager =
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager =
CreateFormManagerWithBestMatches(test_local_form(),
std::move(stored_forms));
@@ -341,16 +342,16 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedFormPasswordSubmitted) {
TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleSuppressed) {
CreateSmartBubbleFieldTrial();
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
password_manager::InteractionsStats stats;
stats.origin_domain = test_local_form().origin.GetOrigin();
stats.username_value = test_local_form().username_value;
stats.dismissal_count = kGreatDissmisalCount;
- auto interactions(make_scoped_ptr(
- new std::vector<scoped_ptr<password_manager::InteractionsStats>>));
+ auto interactions(base::WrapUnique(
+ new std::vector<std::unique_ptr<password_manager::InteractionsStats>>));
interactions->push_back(
- make_scoped_ptr(new password_manager::InteractionsStats(stats)));
+ base::WrapUnique(new password_manager::InteractionsStats(stats)));
test_form_manager->OnGetSiteStatistics(std::move(interactions));
test_form_manager->ProvisionallySave(
test_local_form(),
@@ -368,16 +369,16 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleSuppressed) {
TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleNotSuppressed) {
CreateSmartBubbleFieldTrial();
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
password_manager::InteractionsStats stats;
stats.origin_domain = test_local_form().origin.GetOrigin();
stats.username_value = base::ASCIIToUTF16("not my username");
stats.dismissal_count = kGreatDissmisalCount;
- auto interactions(make_scoped_ptr(
- new std::vector<scoped_ptr<password_manager::InteractionsStats>>));
+ auto interactions(base::WrapUnique(
+ new std::vector<std::unique_ptr<password_manager::InteractionsStats>>));
interactions->push_back(
- make_scoped_ptr(new password_manager::InteractionsStats(stats)));
+ base::WrapUnique(new password_manager::InteractionsStats(stats)));
test_form_manager->OnGetSiteStatistics(std::move(interactions));
test_form_manager->ProvisionallySave(
test_local_form(),
@@ -393,7 +394,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedBubbleNotSuppressed) {
}
TEST_F(ManagePasswordsUIControllerTest, PasswordSaved) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
test_form_manager->ProvisionallySave(
test_local_form(),
@@ -405,7 +406,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSaved) {
}
TEST_F(ManagePasswordsUIControllerTest, PasswordBlacklisted) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
test_form_manager->ProvisionallySave(
test_local_form(),
@@ -417,7 +418,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordBlacklisted) {
}
TEST_F(ManagePasswordsUIControllerTest, NormalNavigations) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
controller()->OnPasswordSubmitted(std::move(test_form_manager));
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
@@ -433,7 +434,7 @@ TEST_F(ManagePasswordsUIControllerTest, NormalNavigations) {
}
TEST_F(ManagePasswordsUIControllerTest, NormalNavigationsClosedBubble) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
controller()->OnPasswordSubmitted(std::move(test_form_manager));
controller()->SavePassword();
@@ -452,7 +453,7 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedToNonWebbyURL) {
content::WebContentsTester::For(web_contents())
->NavigateAndCommit(GURL("chrome://sign-in"));
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
test_form_manager->ProvisionallySave(
test_local_form(),
@@ -469,7 +470,7 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedElsewhere) {
autofill::PasswordFormMap map;
map.insert(std::make_pair(
kTestUsername,
- make_scoped_ptr(new autofill::PasswordForm(test_local_form()))));
+ base::WrapUnique(new autofill::PasswordForm(test_local_form()))));
controller()->OnPasswordAutofilled(map, map.begin()->second->origin, nullptr);
test_local_form().blacklisted_by_user = true;
@@ -485,7 +486,7 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedElsewhere) {
}
TEST_F(ManagePasswordsUIControllerTest, AutomaticPasswordSave) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
controller()->OnAutomaticPasswordSave(std::move(test_form_manager));
@@ -607,7 +608,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutoSigninFirstRun) {
TEST_F(ManagePasswordsUIControllerTest, AutoSigninFirstRunAfterAutofill) {
// Setup the managed state first.
- scoped_ptr<autofill::PasswordForm> test_form(
+ std::unique_ptr<autofill::PasswordForm> test_form(
new autofill::PasswordForm(test_local_form()));
autofill::PasswordForm* test_form_ptr = test_form.get();
const base::string16 kTestUsername = test_form->username_value;
@@ -651,7 +652,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) {
controller()->OnAutoSignin(std::move(local_credentials),
test_local_form().origin);
ExpectIconAndControllerStateIs(password_manager::ui::AUTO_SIGNIN_STATE);
- scoped_ptr<autofill::PasswordForm> test_form(
+ std::unique_ptr<autofill::PasswordForm> test_form(
new autofill::PasswordForm(test_local_form()));
autofill::PasswordFormMap map;
base::string16 kTestUsername = test_form->username_value;
@@ -664,7 +665,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutofillDuringAutoSignin) {
TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) {
base::string16 kTestUsername = base::ASCIIToUTF16("test_username");
autofill::PasswordFormMap map;
- scoped_ptr<autofill::PasswordForm> psl_matched_test_form(
+ std::unique_ptr<autofill::PasswordForm> psl_matched_test_form(
new autofill::PasswordForm(test_local_form()));
psl_matched_test_form->is_public_suffix_match = true;
map.insert(std::make_pair(kTestUsername, std::move(psl_matched_test_form)));
@@ -674,7 +675,7 @@ TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) {
}
TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
controller()->OnUpdatePasswordSubmitted(std::move(test_form_manager));
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
@@ -684,7 +685,7 @@ TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) {
}
TEST_F(ManagePasswordsUIControllerTest, PasswordUpdated) {
- scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
+ std::unique_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
test_form_manager->ProvisionallySave(
test_local_form(),
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_ui_controller.cc ('k') | chrome/browser/ui/passwords/password_bubble_experiment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698