CREDENTIAL: Convert federations from URLs to origins throughout.

ios/web/web_state/js/credential_util_unittest.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/web/public/web_state/js/credential_util.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "ios/web/public/web_state/credential.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace web {
 namespace {
 
 // "type" value for a DictionaryValue representation of PasswordCredential.
 const char* kTestCredentialTypePassword = "PasswordCredential";
 
 // "type" value for a DictionaryValue representation of FederatedCredential.
 const char* kTestCredentialTypeFederated = "FederatedCredential";
 
@@ skipping 23 matching lines @@
   return credential;
 }
 
 // Returns a credential with Federated type.
 Credential GetTestFederatedCredential() {
   Credential credential;
   credential.type = CredentialType::CREDENTIAL_TYPE_FEDERATED;
   credential.id = base::ASCIIToUTF16(kTestCredentialID);
   credential.name = base::ASCIIToUTF16(kTestCredentialName);
   credential.avatar_url = GURL(kTestCredentialAvatarURL);
-  credential.federation_url = GURL(kTestCredentialFederationURL);
+  credential.federation_origin =
+      url::Origin(GURL(kTestCredentialFederationURL));
   return credential;
 }
 
 // Returns a value representing the credential returned by
 // |GetTestPasswordCredential()|.
 scoped_ptr<base::DictionaryValue> GetTestPasswordCredentialDictionaryValue() {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
   value->SetString("type", kTestCredentialTypePassword);
   value->SetString("id", kTestCredentialID);
   value->SetString("name", kTestCredentialName);
   value->SetString("avatarURL", kTestCredentialAvatarURL);
   value->SetString("password", kTestCredentialPassword);
   return value;
 }
 
 // Returns a value representing the credential returned by
 // |GetTestFederatedCredentialDictionaryValue()|.
 scoped_ptr<base::DictionaryValue> GetTestFederatedCredentialDictionaryValue() {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
   value->SetString("type", kTestCredentialTypeFederated);
   value->SetString("id", kTestCredentialID);
   value->SetString("name", kTestCredentialName);
   value->SetString("avatarURL", kTestCredentialAvatarURL);
-  value->SetString("federation", kTestCredentialFederationURL);
+  value->SetString("federation",
+                   url::Origin(GURL(kTestCredentialFederationURL)).Serialize());
   return value;
 }
 
 // Tests that parsing an empty value fails.
 TEST(CredentialUtilTest, ParsingEmptyValueFails) {
   base::DictionaryValue value;
   Credential credential;
   EXPECT_FALSE(DictionaryValueToCredential(value, &credential));
 }
 
@@ skipping 122 matching lines @@
 TEST(CredentialUtilTest, SerializeEmptyCredentialIntoNonEmptyDictionary) {
   base::DictionaryValue value;
   value.SetString("foo", "bar");
   Credential credential;
   CredentialToDictionaryValue(credential, &value);
   EXPECT_TRUE(make_scoped_ptr(new base::DictionaryValue)->Equals(&value));
 }
 
 }  // namespace
 }  // namespace web