| Index: ios/web/web_state/js/credential_util_unittest.mm
|
| diff --git a/ios/web/web_state/js/credential_util_unittest.mm b/ios/web/web_state/js/credential_util_unittest.mm
|
| index 92d8e66eb73f865888f21e97208a218c12a57c2c..571666085200d6e9dc2fe06459ab3ac6d8b942f2 100644
|
| --- a/ios/web/web_state/js/credential_util_unittest.mm
|
| +++ b/ios/web/web_state/js/credential_util_unittest.mm
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "ios/web/public/web_state/js/credential_util.h"
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "ios/web/public/web_state/credential.h"
|
| @@ -64,8 +66,9 @@ Credential GetTestFederatedCredential() {
|
|
|
| // Returns a value representing the credential returned by
|
| // |GetTestPasswordCredential()|.
|
| -scoped_ptr<base::DictionaryValue> GetTestPasswordCredentialDictionaryValue() {
|
| - scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
|
| +std::unique_ptr<base::DictionaryValue>
|
| +GetTestPasswordCredentialDictionaryValue() {
|
| + std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue);
|
| value->SetString("type", kTestCredentialTypePassword);
|
| value->SetString("id", kTestCredentialID);
|
| value->SetString("name", kTestCredentialName);
|
| @@ -76,8 +79,9 @@ scoped_ptr<base::DictionaryValue> GetTestPasswordCredentialDictionaryValue() {
|
|
|
| // Returns a value representing the credential returned by
|
| // |GetTestFederatedCredentialDictionaryValue()|.
|
| -scoped_ptr<base::DictionaryValue> GetTestFederatedCredentialDictionaryValue() {
|
| - scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
|
| +std::unique_ptr<base::DictionaryValue>
|
| +GetTestFederatedCredentialDictionaryValue() {
|
| + std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue);
|
| value->SetString("type", kTestCredentialTypeFederated);
|
| value->SetString("id", kTestCredentialID);
|
| value->SetString("name", kTestCredentialName);
|
| @@ -96,7 +100,7 @@ TEST(CredentialUtilTest, ParsingEmptyValueFails) {
|
|
|
| // Tests that parsing a value with a bad type fails.
|
| TEST(CredentialUtilTest, ParsingValueWithBadTypeFails) {
|
| - scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
|
| + std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue);
|
| value->SetString("type", "FooCredential");
|
| Credential credential;
|
| EXPECT_FALSE(DictionaryValueToCredential(*value, &credential));
|
| @@ -114,7 +118,7 @@ TEST(CredentialUtilTest, ParsingPasswordCredentialSucceeds) {
|
| // Tests that parsing a value representing a PasswordCredential but with no ID
|
| // specified fails.
|
| TEST(CredentialUtilTest, ParsingPasswordCredentialWithNoIDFails) {
|
| - scoped_ptr<base::DictionaryValue> value(
|
| + std::unique_ptr<base::DictionaryValue> value(
|
| GetTestPasswordCredentialDictionaryValue());
|
| value->RemoveWithoutPathExpansion("id", nullptr);
|
| Credential credential;
|
| @@ -124,7 +128,7 @@ TEST(CredentialUtilTest, ParsingPasswordCredentialWithNoIDFails) {
|
| // Tests that parsing a value representing a PasswordCredential with a badly-
|
| // formed avatarURL fails.
|
| TEST(CredentialUtilTest, ParsingPasswordCredentialWithBadAvatarURLFails) {
|
| - scoped_ptr<base::DictionaryValue> value(
|
| + std::unique_ptr<base::DictionaryValue> value(
|
| GetTestPasswordCredentialDictionaryValue());
|
| value->SetString("avatarURL", "foo");
|
| Credential credential;
|
| @@ -134,7 +138,7 @@ TEST(CredentialUtilTest, ParsingPasswordCredentialWithBadAvatarURLFails) {
|
| // Tests that parsing a value representing a PasswordCredential with no password
|
| // specified fails.
|
| TEST(CredentialUtilTest, ParsingPasswordCredentialWithNoPasswordFails) {
|
| - scoped_ptr<base::DictionaryValue> value(
|
| + std::unique_ptr<base::DictionaryValue> value(
|
| GetTestPasswordCredentialDictionaryValue());
|
| value->Remove("password", nullptr);
|
| Credential credential;
|
| @@ -153,7 +157,7 @@ TEST(CredentialUtilTest, ParsingFederatedCredentialSucceeds) {
|
| // Tests that parsing a value representing a FederatedCredential with no ID
|
| // fails.
|
| TEST(CredentialUtilTest, ParsingFederatedCredentialWithNoIDFails) {
|
| - scoped_ptr<base::DictionaryValue> value(
|
| + std::unique_ptr<base::DictionaryValue> value(
|
| GetTestFederatedCredentialDictionaryValue());
|
| value->RemoveWithoutPathExpansion("id", nullptr);
|
| Credential credential;
|
| @@ -163,7 +167,7 @@ TEST(CredentialUtilTest, ParsingFederatedCredentialWithNoIDFails) {
|
| // Tests that parsing a value representing a FederatedCredential with a badly-
|
| // formed avatarURL fails.
|
| TEST(CredentialUtilTest, ParsingFederatedCredentialWithBadAvatarURLFails) {
|
| - scoped_ptr<base::DictionaryValue> value(
|
| + std::unique_ptr<base::DictionaryValue> value(
|
| GetTestFederatedCredentialDictionaryValue());
|
| value->SetString("avatarURL", "foo");
|
| Credential credential;
|
| @@ -173,7 +177,7 @@ TEST(CredentialUtilTest, ParsingFederatedCredentialWithBadAvatarURLFails) {
|
| // Tests that parsing a value representing a FederatedCredential with no
|
| // federation URL fails.
|
| TEST(CredentialUtilTest, ParsingFederatedValueWithNoFederationURLFails) {
|
| - scoped_ptr<base::DictionaryValue> value(
|
| + std::unique_ptr<base::DictionaryValue> value(
|
| GetTestFederatedCredentialDictionaryValue());
|
| value->Remove("federation", nullptr);
|
| Credential credential;
|
| @@ -183,7 +187,7 @@ TEST(CredentialUtilTest, ParsingFederatedValueWithNoFederationURLFails) {
|
| // Tests that parsing a value representing a FederatedCredential with a badly-
|
| // formed federationURL fails.
|
| TEST(CredentialUtilTest, ParsingFederatedValueWithBadFederationURLFails) {
|
| - scoped_ptr<base::DictionaryValue> value(
|
| + std::unique_ptr<base::DictionaryValue> value(
|
| GetTestFederatedCredentialDictionaryValue());
|
| value->SetString("federation", "bar");
|
| Credential credential;
|
| @@ -213,7 +217,7 @@ TEST(CredentialUtilTest, SerializeEmptyCredential) {
|
| base::DictionaryValue value;
|
| Credential credential;
|
| CredentialToDictionaryValue(credential, &value);
|
| - EXPECT_TRUE(make_scoped_ptr(new base::DictionaryValue)->Equals(&value));
|
| + EXPECT_TRUE(base::WrapUnique(new base::DictionaryValue)->Equals(&value));
|
| }
|
|
|
| TEST(CredentialUtilTest, SerializeEmptyCredentialIntoNonEmptyDictionary) {
|
| @@ -221,7 +225,7 @@ TEST(CredentialUtilTest, SerializeEmptyCredentialIntoNonEmptyDictionary) {
|
| value.SetString("foo", "bar");
|
| Credential credential;
|
| CredentialToDictionaryValue(credential, &value);
|
| - EXPECT_TRUE(make_scoped_ptr(new base::DictionaryValue)->Equals(&value));
|
| + EXPECT_TRUE(base::WrapUnique(new base::DictionaryValue)->Equals(&value));
|
| }
|
|
|
| } // namespace
|
|
|