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

chrome/renderer/autofill/password_autofill_agent_browsertest.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 "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/content/renderer/autofill_agent.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
@@ skipping 184 matching lines @@
     password1_ = ASCIIToUTF16(kAlicePassword);
     username2_ = ASCIIToUTF16(kBobUsername);
     password2_ = ASCIIToUTF16(kBobPassword);
     username3_ = ASCIIToUTF16(kCarolUsername);
     password3_ = ASCIIToUTF16(kCarolPassword);
     alternate_username3_ = ASCIIToUTF16(kCarolAlternateUsername);
 
     FormFieldData username_field;
     username_field.name = ASCIIToUTF16(kUsernameName);
     username_field.value = username1_;
-    fill_data_.basic_data.fields.push_back(username_field);
+    fill_data_.username_field = username_field;
 
     FormFieldData password_field;
     password_field.name = ASCIIToUTF16(kPasswordName);
     password_field.value = password1_;
     password_field.form_control_type = "password";
-    fill_data_.basic_data.fields.push_back(password_field);
+    fill_data_.password_field = password_field;
 
     PasswordAndRealm password2;
     password2.password = password2_;
     fill_data_.additional_logins[username2_] = password2;
     PasswordAndRealm password3;
     password3.password = password3_;
     fill_data_.additional_logins[username3_] = password3;
 
     UsernamesCollectionKey key;
     key.username = username3_;
     key.password = password3_;
     key.realm = "google.com";
     fill_data_.other_possible_usernames[key].push_back(alternate_username3_);
 
     // We need to set the origin so it matches the frame URL and the action so
     // it matches the form action, otherwise we won't autocomplete.
     UpdateOriginForHTML(kFormHTML);
-    fill_data_.basic_data.action = GURL("http://www.bidule.com");
+    fill_data_.action = GURL("http://www.bidule.com");
 
     LoadHTML(kFormHTML);
 
     // Now retrieve the input elements so the test can access them.
     UpdateUsernameAndPasswordElements();
   }
 
   void TearDown() override {
     username_element_.reset();
     password_element_.reset();
     ChromeRenderViewTest::TearDown();
   }
 
   void UpdateOriginForHTML(const std::string& html) {
     std::string origin = "data:text/html;charset=utf-8," + html;
-    fill_data_.basic_data.origin = GURL(origin);
+    fill_data_.origin = GURL(origin);
   }
 
   void UpdateUsernameAndPasswordElements() {
     WebDocument document = GetMainFrame()->document();
     WebElement element =
         document.getElementById(WebString::fromUTF8(kUsernameName));
     ASSERT_FALSE(element.isNull());
     username_element_ = element.to<blink::WebInputElement>();
     element = document.getElementById(WebString::fromUTF8(kPasswordName));
     ASSERT_FALSE(element.isNull());
@@ skipping 136 matching lines @@
   // the expected flag for the PasswordAutofillManager, whether to show all
   // suggestions, or only those starting with |username|.
   void CheckSuggestions(const std::string& username, bool show_all) {
     const IPC::Message* message =
         render_thread_->sink().GetFirstMessageMatching(
             AutofillHostMsg_ShowPasswordSuggestions::ID);
     EXPECT_TRUE(message);
     Tuple5<int, base::i18n::TextDirection, base::string16, bool, gfx::RectF>
         args;
     AutofillHostMsg_ShowPasswordSuggestions::Read(message, &args);
-    EXPECT_EQ(2u, fill_data_.basic_data.fields.size());
     EXPECT_EQ(kPasswordFillFormDataId, args.a);
     EXPECT_EQ(ASCIIToUTF16(username), args.c);
     EXPECT_EQ(show_all, args.d);
 
     render_thread_->sink().ClearMessages();
   }
 
   void ExpectFormSubmittedWithPasswords(const std::string& password_value,
                                         const std::string& new_password_value) {
     const IPC::Message* message =
@@ skipping 70 matching lines @@
   WebElement element =
       document.getElementById(WebString::fromUTF8(kUsernameName));
   ASSERT_FALSE(element.isNull());
   username_element_ = element.to<blink::WebInputElement>();
   element = document.getElementById(WebString::fromUTF8(kPasswordName));
   ASSERT_FALSE(element.isNull());
   password_element_ = element.to<blink::WebInputElement>();
 
   // Set the expected form origin and action URLs.
   UpdateOriginForHTML(kEmptyActionFormHTML);
-  fill_data_.basic_data.action = fill_data_.basic_data.origin;
+  fill_data_.action = fill_data_.origin;
 
   // Simulate the browser sending back the login info, it triggers the
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
   // The username and password should have been autocompleted.
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
 }
 
 // Tests that if a password is marked as readonly, neither field is autofilled
@@ skipping 339 matching lines @@
   std::string origin("data:text/html;charset=utf-8,");
   origin += kSimpleWebpage;
 
   std::string page_html(kWebpageWithIframeStart);
   page_html += origin;
   page_html += kWebpageWithIframeEnd;
 
   LoadHTML(page_html.c_str());
 
   // Set the expected form origin and action URLs.
-  fill_data_.basic_data.origin = GURL(origin);
-  fill_data_.basic_data.action = GURL(origin);
+  fill_data_.origin = GURL(origin);
+  fill_data_.action = GURL(origin);
 
   SimulateOnFillPasswordForm(fill_data_);
 
   // Retrieve the input elements from the iframe since that is where we want to
   // test the autofill.
   WebFrame* iframe = GetMainFrame()->findChildByName(kIframeName);
   ASSERT_TRUE(iframe);
   WebDocument document = iframe->document();
 
   WebElement username_element = document.getElementById(kUsernameName);
@@ skipping 649 matching lines @@
                                 password_element_,
                                 /*is_user_input=*/true);
 
   // Simulate the user typing a stored username.
   SimulateUsernameChange(kAliceUsername, true);
   // The autofileld password should replace the typed one.
   CheckTextFieldsDOMState(kAliceUsername, true, kAlicePassword, true);
 }
 
 }  // namespace autofill