Fix for no password save when action URL is modified

chrome/browser/password_manager/password_form_manager_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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
@@ skipping 145 matching lines @@
 
   // Successful login. The PasswordManager would instruct PasswordFormManager
   // to save, which should know this is a new login.
   EXPECT_TRUE(manager->IsNewLogin());
   // Make sure the credentials that would be submitted on successful login
   // are going to match the stored entry in the db.
   EXPECT_EQ(observed_form()->origin.spec(),
             GetPendingCredentials(manager)->origin.spec());
   EXPECT_EQ(observed_form()->signon_realm,
             GetPendingCredentials(manager)->signon_realm);
+  EXPECT_EQ(observed_form()->action,
+              GetPendingCredentials(manager)->action);
   EXPECT_TRUE(GetPendingCredentials(manager)->preferred);
   EXPECT_EQ(saved_match()->password_value,
             GetPendingCredentials(manager)->password_value);
   EXPECT_EQ(saved_match()->username_value,
             GetPendingCredentials(manager)->username_value);
 
   // Now, suppose the user re-visits the site and wants to save an additional
   // login for the site with a new username. In this case, the matching phase
   // will yield the previously saved login.
   SimulateMatchingPhase(manager, true);
@@ skipping 87 matching lines @@
   login.username_value = saved_match()->username_value;
   login.password_value = saved_match()->password_value;
   manager->ProvisionallySave(login);
   EXPECT_FALSE(manager->IsNewLogin());
   // We bless our saved PasswordForm entry with the action URL of the
   // observed form.
   EXPECT_EQ(observed_form()->action,
             GetPendingCredentials(manager.get())->action);
 }
 
+TEST_F(PasswordFormManagerTest, TestUpdateAction) {
+  scoped_ptr<PasswordFormManager> manager(new PasswordFormManager(
+      profile(), NULL, NULL, *observed_form(), false));
+
+  SimulateMatchingPhase(manager.get(), true);
+  // User logs in with the autofilled username / password from saved_match.
+  PasswordForm login = *observed_form();
+  login.username_value = saved_match()->username_value;
+  login.password_value = saved_match()->password_value;
+
+  manager->ProvisionallySave(login);
+  EXPECT_FALSE(manager->IsNewLogin());
+  // The observed action URL is different from the previously saved one, and
+  // is the same as the one that would be submitted on successful login.
+  EXPECT_NE(observed_form()->action, saved_match()->action);
+  EXPECT_EQ(observed_form()->action,
+            GetPendingCredentials(manager.get())->action);
+}
+
+TEST_F(PasswordFormManagerTest, TestDynamicAction) {
+  scoped_ptr<PasswordFormManager> manager(new PasswordFormManager(
+      profile(), NULL, NULL, *observed_form(), false));
+
+  SimulateMatchingPhase(manager.get(), false);
+  PasswordForm login(*observed_form());
+  // The submitted action URL is different from the one observed on page load.
+  GURL new_action = GURL("http://www.google.com/new_action");
+  login.action = new_action;
+
+  manager->ProvisionallySave(login);
+  EXPECT_TRUE(manager->IsNewLogin());
+  // Check that the provisionally saved action URL is the same as the submitted
+  // action URL, not the one observed on page load.
+  EXPECT_EQ(new_action,
+            GetPendingCredentials(manager.get())->action);
+}
+
 TEST_F(PasswordFormManagerTest, TestValidForms) {
   // User submits credentials for the observed form.
   PasswordForm credentials = *observed_form();
   credentials.scheme = PasswordForm::SCHEME_HTML;
   credentials.username_value = saved_match()->username_value;
   credentials.password_value = saved_match()->password_value;
 
   // Form with both username_element and password_element.
   PasswordFormManager manager1(profile(), NULL, NULL, credentials, false);
   SimulateMatchingPhase(&manager1, false);
@@ skipping 82 matching lines @@
   // password store, but is blacklisted; We should not send the not blacklisted
   // message.
   manager.reset(new TestPasswordFormManager(
       profile(), &password_manager, *observed_form(), false));
   SimulateFetchMatchingLoginsFromPasswordStore(manager.get(), 3);
   result.clear();
   result.push_back(CreateSavedMatch(true));
   SimulateResponseFromPasswordStore(manager.get(), 3, result);
   EXPECT_EQ(0u, manager->num_sent_messages());
 }