PasswordForm: move from current/old password scheme to current/new.

components/autofill/content/renderer/password_form_conversion_utils_browsertest.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 "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/renderer/password_form_conversion_utils.h"
 #include "components/autofill/core/common/password_form.h"
 #include "content/public/test/render_view_test.h"
@@ skipping 137 matching lines @@
   std::string html = builder.ProduceHTML();
 
   scoped_ptr<PasswordForm> password_form;
   ASSERT_NO_FATAL_FAILURE(LoadHTMLAndConvertForm(html, &password_form));
   ASSERT_NE(static_cast<PasswordForm*>(NULL), password_form.get());
 
   EXPECT_EQ("data:", password_form->signon_realm);
   EXPECT_EQ(GURL(kTestFormActionURL), password_form->action);
   EXPECT_EQ(base::UTF8ToUTF16("username1"), password_form->username_element);
   EXPECT_EQ(base::UTF8ToUTF16("John"), password_form->username_value);
-  EXPECT_EQ(base::UTF8ToUTF16("password2"), password_form->password_element);
-  EXPECT_EQ(base::UTF8ToUTF16("secret"), password_form->password_value);
   EXPECT_EQ(base::UTF8ToUTF16("password1"),
-            password_form->old_password_element);
-  EXPECT_EQ(base::UTF8ToUTF16("oldsecret"), password_form->old_password_value);
-  ASSERT_EQ(2u, password_form->other_possible_usernames.size());
+            password_form->password_element);
+  EXPECT_EQ(base::UTF8ToUTF16("oldsecret"), password_form->password_value);
+  EXPECT_EQ(base::UTF8ToUTF16("password2"),
+            password_form->new_password_element);
+  EXPECT_EQ(base::UTF8ToUTF16("secret"), password_form->new_password_value);
   EXPECT_EQ(base::UTF8ToUTF16("Smith"),
             password_form->other_possible_usernames[0]);
   EXPECT_EQ(base::UTF8ToUTF16("JohnSmith"),
             password_form->other_possible_usernames[1]);
   EXPECT_EQ(PasswordForm::SCHEME_HTML, password_form->scheme);
   EXPECT_FALSE(password_form->ssl_valid);
   EXPECT_FALSE(password_form->preferred);
   EXPECT_FALSE(password_form->blacklisted_by_user);
   EXPECT_EQ(PasswordForm::TYPE_MANUAL, password_form->type);
 }
 
 TEST_F(PasswordFormConversionUtilsTest,
        WebFormwithThreeDifferentPasswordsToPasswordForm) {
   PasswordFormBuilder builder(kTestFormActionURL);
   builder.AddUsernameField("username1", "John");
   builder.AddPasswordField("password1", "alpha");
   builder.AddPasswordField("password2", "beta");
   builder.AddPasswordField("password3", "gamma");
   builder.AddSubmitButton();
   std::string html = builder.ProduceHTML();
 
   scoped_ptr<PasswordForm> password_form;
   ASSERT_NO_FATAL_FAILURE(LoadHTMLAndConvertForm(html, &password_form));
   ASSERT_EQ(static_cast<PasswordForm*>(NULL), password_form.get());
 }
 
 }  // namespace autofill