[Password manager] Relplace the FormFieldData vector from autofill::FormData with named fields…

components/password_manager/core/browser/password_autofill_manager_unittest.cc

 // Copyright 2013 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 "components/password_manager/core/browser/password_autofill_manager.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
@@ skipping 63 matching lines @@
   PasswordAutofillManagerTest()
       : test_username_(base::ASCIIToUTF16(kAliceUsername)),
         test_password_(base::ASCIIToUTF16(kAlicePassword)),
         fill_data_id_(0) {}
 
   void SetUp() override {
     // Add a preferred login and an additional login to the FillData.
     autofill::FormFieldData username_field;
     username_field.name = base::ASCIIToUTF16(kUsernameName);
     username_field.value = test_username_;
-    fill_data_.basic_data.fields.push_back(username_field);
+    fill_data_.username_field = username_field;
 
     autofill::FormFieldData password_field;
     password_field.name = base::ASCIIToUTF16(kPasswordName);
     password_field.value = test_password_;
-    fill_data_.basic_data.fields.push_back(password_field);
+    fill_data_.password_field = password_field;
   }
 
   void InitializePasswordAutofillManager(
       PasswordManagerClient* client,
       autofill::AutofillClient* autofill_client) {
     password_autofill_manager_.reset(
         new PasswordAutofillManager(client, autofill_client));
     password_autofill_manager_->OnAddPasswordFormMapping(fill_data_id_,
                                                          fill_data_);
   }
@@ skipping 66 matching lines @@
 
 // Test that the popup is marked as visible after recieving password
 // suggestions.
 TEST_F(PasswordAutofillManagerTest, ExternalDelegatePasswordSuggestions) {
   scoped_ptr<TestPasswordManagerClient> client(new TestPasswordManagerClient);
   scoped_ptr<MockAutofillClient> autofill_client(new MockAutofillClient);
   InitializePasswordAutofillManager(client.get(), autofill_client.get());
 
   gfx::RectF element_bounds;
   autofill::PasswordFormFillData data;
-  data.basic_data.fields.resize(2);
-  data.basic_data.fields[0].value = test_username_;
-  data.basic_data.fields[1].value = test_password_;
+  data.username_field.value = test_username_;
+  data.password_field.value = test_password_;
   data.preferred_realm = "http://foo.com/";
   int dummy_key = 0;
   password_autofill_manager_->OnAddPasswordFormMapping(dummy_key, data);
 
   EXPECT_CALL(*client->mock_driver(),
               FillSuggestion(test_username_, test_password_));
 
   // The enums must be cast to ints to prevent compile errors on linux_rel.
   EXPECT_CALL(*autofill_client,
               ShowAutofillPopup(
@@ skipping 16 matching lines @@
 
 // Test that OnShowPasswordSuggestions correctly matches the given FormFieldData
 // to the known PasswordFormFillData, and extracts the right suggestions.
 TEST_F(PasswordAutofillManagerTest, ExtractSuggestions) {
   scoped_ptr<TestPasswordManagerClient> client(new TestPasswordManagerClient);
   scoped_ptr<MockAutofillClient> autofill_client(new MockAutofillClient);
   InitializePasswordAutofillManager(client.get(), autofill_client.get());
 
   gfx::RectF element_bounds;
   autofill::PasswordFormFillData data;
-  data.basic_data.fields.resize(2);
-  data.basic_data.fields[0].value = test_username_;
-  data.basic_data.fields[1].value = test_password_;
+  data.username_field.value = test_username_;
+  data.password_field.value = test_password_;
   data.preferred_realm = "http://foo.com/";
 
   autofill::PasswordAndRealm additional;
   additional.realm = "https://foobarrealm.org";
   base::string16 additional_username(base::ASCIIToUTF16("John Foo"));
   data.additional_logins[additional_username] = additional;
 
   autofill::UsernamesCollectionKey usernames_key;
   usernames_key.realm = "http://yetanother.net";
   std::vector<base::string16> other_names;
@@ skipping 31 matching lines @@
                   element_bounds, _,
                   testing::UnorderedElementsAre(
                       test_username_, additional_username, other_username),
                   _, _, _, _));
   password_autofill_manager_->OnShowPasswordSuggestions(
       dummy_key, base::i18n::RIGHT_TO_LEFT, base::ASCIIToUTF16("xyz"), true,
       element_bounds);
 }
 
 }  // namespace password_manager