Credential Management: Rename 'LocalCredential' to 'PasswordCredential' (2/3)

ios/web/web_state/js/credential_util_unittest.mm

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 0ba7cf1f18c2275251a607ad476bc5b6a28eb2ae..dc42abdb3bda851dd676798838992ea8ff33b4fa 100644
--- a/ios/web/web_state/js/credential_util_unittest.mm
+++ b/ios/web/web_state/js/credential_util_unittest.mm
@@ -17,8 +17,8 @@
 namespace web {
 namespace {
 
-// "type" value for a DictionaryValue representation of LocalCredential.
-const char* kTestCredentialTypeLocal = "LocalCredential";
+// "type" value for a DictionaryValue representation of PasswordCredential.
+const char* kTestCredentialTypePassword = "PasswordCredential";
 
 // "type" value for a DictionaryValue representation of FederatedCredential.
 const char* kTestCredentialTypeFederated = "FederatedCredential";
@@ -38,10 +38,10 @@ const char* kTestCredentialPassword = "baz";
 // "federationURL" value for a DictionaryValue representation of a credential.
 const char* kTestCredentialFederationURL = "https://foo.com/";
 
-// Returns a Credential with Local type.
-Credential GetTestLocalCredential() {
+// Returns a Credential with Password type.
+Credential GetTestPasswordCredential() {
   Credential credential;
-  credential.type = CredentialType::CREDENTIAL_TYPE_LOCAL;
+  credential.type = CredentialType::CREDENTIAL_TYPE_PASSWORD;
   credential.id = base::ASCIIToUTF16(kTestCredentialID);
   credential.name = base::ASCIIToUTF16(kTestCredentialName);
   credential.avatar_url = GURL(kTestCredentialAvatarURL);
@@ -61,10 +61,10 @@ Credential GetTestFederatedCredential() {
 }
 
 // Returns a value representing the credential returned by
-// |GetTestLocalCredential()|.
-scoped_ptr<base::DictionaryValue> GetTestLocalCredentialDictionaryValue() {
+// |GetTestPasswordCredential()|.
+scoped_ptr<base::DictionaryValue> GetTestPasswordCredentialDictionaryValue() {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
-  value->SetString("type", kTestCredentialTypeLocal);
+  value->SetString("type", kTestCredentialTypePassword);
   value->SetString("id", kTestCredentialID);
   value->SetString("name", kTestCredentialName);
   value->SetString("avatarURL", kTestCredentialAvatarURL);
@@ -99,40 +99,40 @@ TEST(CredentialUtilTest, ParsingValueWithBadTypeFails) {
   EXPECT_FALSE(DictionaryValueToCredential(*value, &credential));
 }
 
-// Tests that parsing a correctly-formed value representing a LocalCredential
+// Tests that parsing a correctly-formed value representing a PasswordCredential
 // succeeds.
-TEST(CredentialUtilTest, ParsingLocalCredentialSucceeds) {
+TEST(CredentialUtilTest, ParsingPasswordCredentialSucceeds) {
   Credential credential;
   EXPECT_TRUE(DictionaryValueToCredential(
-      *GetTestLocalCredentialDictionaryValue(), &credential));
-  EXPECT_TRUE(CredentialsEqual(GetTestLocalCredential(), credential));
+      *GetTestPasswordCredentialDictionaryValue(), &credential));
+  EXPECT_TRUE(CredentialsEqual(GetTestPasswordCredential(), credential));
 }
 
-// Tests that parsing a value representing a LocalCredential but with no ID
+// Tests that parsing a value representing a PasswordCredential but with no ID
 // specified fails.
-TEST(CredentialUtilTest, ParsingLocalCredentialWithNoIDFails) {
+TEST(CredentialUtilTest, ParsingPasswordCredentialWithNoIDFails) {
   scoped_ptr<base::DictionaryValue> value(
-      GetTestLocalCredentialDictionaryValue().Pass());
+      GetTestPasswordCredentialDictionaryValue().Pass());
   value->RemoveWithoutPathExpansion("id", nullptr);
   Credential credential;
   EXPECT_FALSE(DictionaryValueToCredential(*value, &credential));
 }
 
-// Tests that parsing a value representing a LocalCredential with a badly-
+// Tests that parsing a value representing a PasswordCredential with a badly-
 // formed avatarURL fails.
-TEST(CredentialUtilTest, ParsingLocalCredentialWithBadAvatarURLFails) {
+TEST(CredentialUtilTest, ParsingPasswordCredentialWithBadAvatarURLFails) {
   scoped_ptr<base::DictionaryValue> value(
-      GetTestLocalCredentialDictionaryValue().Pass());
+      GetTestPasswordCredentialDictionaryValue().Pass());
   value->SetString("avatarURL", "foo");
   Credential credential;
   EXPECT_FALSE(DictionaryValueToCredential(*value, &credential));
 }
 
-// Tests that parsing a value representing a LocalCredential with no password
+// Tests that parsing a value representing a PasswordCredential with no password
 // specified fails.
-TEST(CredentialUtilTest, ParsingLocalCredentialWithNoPasswordFails) {
+TEST(CredentialUtilTest, ParsingPasswordCredentialWithNoPasswordFails) {
   scoped_ptr<base::DictionaryValue> value(
-      GetTestLocalCredentialDictionaryValue().Pass());
+      GetTestPasswordCredentialDictionaryValue().Pass());
   value->Remove("password", nullptr);
   Credential credential;
   EXPECT_FALSE(DictionaryValueToCredential(*value, &credential));
@@ -196,13 +196,14 @@ TEST(CredentialUtilTest, SerializeFederatedCredential) {
   EXPECT_TRUE(GetTestFederatedCredentialDictionaryValue()->Equals(&value));
 }
 
-// Tests that serializing a LocalCredential to a DictionaryValue results in the
+// Tests that serializing a PasswordCredential to a DictionaryValue results in
+// the

[vabr (Chromium), 2015/06/01 09:55:23]

nit: Please join lines 200 and 201.

 // expected structure.
-TEST(CredentialUtilTest, SerializeLocalCredential) {
+TEST(CredentialUtilTest, SerializePasswordCredential) {
   base::DictionaryValue value;
-  Credential credential(GetTestLocalCredential());
+  Credential credential(GetTestPasswordCredential());
   CredentialToDictionaryValue(credential, &value);
-  EXPECT_TRUE(GetTestLocalCredentialDictionaryValue()->Equals(&value));
+  EXPECT_TRUE(GetTestPasswordCredentialDictionaryValue()->Equals(&value));
 }
 
 TEST(CredentialUtilTest, SerializeEmptyCredential) {