CREDENTIAL: Convert federations from URLs to origins throughout.

chrome/browser/password_manager/password_store_mac_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/password_manager/password_store_mac.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 11 matching lines @@
 #include "components/os_crypt/os_crypt.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/browser/password_store_origin_unittest.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "crypto/mock_apple_keychain.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/origin.h"
 
 using autofill::PasswordForm;
 using base::ASCIIToUTF16;
 using base::WideToUTF16;
 using content::BrowserThread;
 using crypto::MockAppleKeychain;
 using internal_keychain_helpers::FormsMatchForMerge;
 using internal_keychain_helpers::STRICT_FORM_MATCH;
 using password_manager::CreatePasswordFormFromDataForTesting;
 using password_manager::LoginDatabase;
@@ skipping 94 matching lines @@
     EXPECT_EQ(WideToUTF16(expectation->password_element),
               form->password_element);
     if (expectation->username_value) {
       EXPECT_EQ(WideToUTF16(expectation->username_value), form->username_value);
       EXPECT_EQ(WideToUTF16(expectation->username_value), form->display_name);
       EXPECT_TRUE(form->skip_zero_click);
       if (expectation->password_value &&
           wcscmp(expectation->password_value,
                  password_manager::kTestingFederatedLoginMarker) == 0) {
         EXPECT_TRUE(form->password_value.empty());
-        EXPECT_EQ(GURL(password_manager::kTestingFederationUrlSpec),
-                  form->federation_url);
+        EXPECT_EQ(
+            url::Origin(GURL(password_manager::kTestingFederationUrlSpec)),
+            form->federation_origin);
       } else {
         EXPECT_EQ(WideToUTF16(expectation->password_value),
                   form->password_value);
-        EXPECT_TRUE(form->federation_url.is_empty());
+        EXPECT_TRUE(form->federation_origin.unique());
       }
     } else {
       EXPECT_TRUE(form->blacklisted_by_user);
     }
     EXPECT_EQ(expectation->preferred, form->preferred);
     EXPECT_EQ(expectation->ssl_valid, form->ssl_valid);
     EXPECT_DOUBLE_EQ(expectation->creation_time,
                      form->date_created.ToDoubleT());
     base::Time created = base::Time::FromDoubleT(expectation->creation_time);
     EXPECT_EQ(
@@ skipping 707 matching lines @@
   {
     PasswordForm form_a(base_form);
     form_a.blacklisted_by_user = true;
     PasswordForm form_b(form_a);
     EXPECT_FALSE(FormsMatchForMerge(form_a, form_b, STRICT_FORM_MATCH));
   }
 
   // Federated login forms should never match for merging either.
   {
     PasswordForm form_b(base_form);
-    form_b.federation_url = GURL(password_manager::kTestingFederationUrlSpec);
+    form_b.federation_origin =
+        url::Origin(GURL(password_manager::kTestingFederationUrlSpec));
     EXPECT_FALSE(FormsMatchForMerge(base_form, form_b, STRICT_FORM_MATCH));
     EXPECT_FALSE(FormsMatchForMerge(form_b, base_form, STRICT_FORM_MATCH));
     EXPECT_FALSE(FormsMatchForMerge(form_b, form_b, STRICT_FORM_MATCH));
   }
 }
 
 TEST_F(PasswordStoreMacInternalsTest, TestFormMerge) {
   // Set up a bunch of test data to use in varying combinations.
   /* clang-format off */
   PasswordFormData keychain_user_1 =
@@ skipping 908 matching lines @@
   form.username_value = base::UTF8ToUTF16("randomusername");
   form.password_value = base::UTF8ToUTF16("password");
 
   VerifyCredentialLifecycle(form);
 }
 
 // Verify that federated credentials can be stored, retrieved and deleted.
 TEST_F(PasswordStoreMacTest, StoringAndRetrievingFederatedCredentials) {
   PasswordForm form;
   form.signon_realm = "android://7x7IDboo8u9YKraUsbmVkuf1@net.rateflix.app/";
-  form.federation_url = GURL(password_manager::kTestingFederationUrlSpec);
+  form.federation_origin =
+      url::Origin(GURL(password_manager::kTestingFederationUrlSpec));
   form.username_value = base::UTF8ToUTF16("randomusername");
   form.password_value = base::UTF8ToUTF16("");  // No password.
 
   VerifyCredentialLifecycle(form);
 }
 
 void CheckMigrationResult(PasswordStoreMac::MigrationResult expected_result,
                           PasswordStoreMac::MigrationResult result) {
   EXPECT_EQ(expected_result, result);
   QuitUIMessageLoop();
@@ skipping 49 matching lines @@
   histogram_tester_.reset();
 }
 
 // Import a federated credential while the Keychain is locked.
 TEST_F(PasswordStoreMacTest, ImportFederatedFromLockedKeychain) {
   keychain()->set_locked(true);
   PasswordForm form1;
   form1.origin = GURL("http://example.com/Login");
   form1.signon_realm = "http://example.com/";
   form1.username_value = ASCIIToUTF16("my_username");
-  form1.federation_url = GURL("https://accounts.google.com/");
+  form1.federation_origin = url::Origin(GURL("https://accounts.google.com/"));
 
   store()->AddLogin(form1);
   FinishAsyncProcessing();
   ASSERT_TRUE(base::PostTaskAndReplyWithResult(
       thread_->task_runner().get(), FROM_HERE,
       base::Bind(&PasswordStoreMac::ImportFromKeychain, store()),
       base::Bind(&CheckMigrationResult, PasswordStoreMac::MIGRATION_OK)));
   FinishAsyncProcessing();
 
   ScopedVector<PasswordForm> matching_items;
@@ skipping 35 matching lines @@
   histogram_tester_->ExpectUniqueSample(
       "PasswordManager.KeychainMigration.NumPasswordsOnFailure", 1, 1);
   histogram_tester_->ExpectUniqueSample(
       "PasswordManager.KeychainMigration.NumFailedPasswords", 1, 1);
   histogram_tester_->ExpectUniqueSample(
       "PasswordManager.KeychainMigration.NumChromeOwnedInaccessiblePasswords",
       2, 1);
   // Don't test the encryption key access.
   histogram_tester_.reset();
 }