Drop the edit button in the password save bubble for Views.

Now the bubble is always in the editing mode.

Bug: 734965
Change-Id: I8600b983c5a06170f554bfbd012aea72b04a31f4
Reviewed-on: https://chromium-review.googlesource.com/675365Reviewed-by: Maxim Kolosovskiy <kolos@chromium.org>
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503400}

chrome/browser/ui/cocoa/passwords/save_pending_password_view_controller.mm

@@ -53,8 +53,9 @@ NSString* const kSaveTouchBarId = @"SAVE";
   if (editMode_) {
     PendingPasswordItemView* row =
         [[passwordItemContainer_ subviews] objectAtIndex:0];
-    self.model->OnUsernameEdited(
-        base::SysNSStringToUTF16([[row usernameField] stringValue]));
+    self.model->OnCredentialEdited(
+        base::SysNSStringToUTF16([[row usernameField] stringValue]),
+        self.model->pending_password().password_value);
     [self disableEditMode];
   }
   ManagePasswordsBubbleModel* model = self.model;
@@ -96,8 +97,9 @@ NSString* const kSaveTouchBarId = @"SAVE";
   if (editMode_) {
     PendingPasswordItemView* row =
         [[passwordItemContainer_ subviews] objectAtIndex:0];
-    self.model->OnUsernameEdited(
-        base::SysNSStringToUTF16([[row usernameField] stringValue]));
+    self.model->OnCredentialEdited(
+        base::SysNSStringToUTF16([[row usernameField] stringValue]),
+        self.model->pending_password().password_value);
     [self disableEditMode];
   }
 }

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

@@ -395,14 +395,11 @@ void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
   delegate_->NeverSavePassword();
 }
 
-void ManagePasswordsBubbleModel::OnUsernameEdited(base::string16 new_username) {
-  DCHECK_EQ(password_manager::ui::PENDING_PASSWORD_STATE, state_);
-  pending_password_.username_value = std::move(new_username);
-}
-
-void ManagePasswordsBubbleModel::OnPasswordSelected(
+void ManagePasswordsBubbleModel::OnCredentialEdited(
+    base::string16 new_username,
     base::string16 new_password) {
   DCHECK_EQ(password_manager::ui::PENDING_PASSWORD_STATE, state_);
+  pending_password_.username_value = std::move(new_username);
   pending_password_.password_value = std::move(new_password);
 }
 

chrome/browser/ui/passwords/manage_passwords_bubble_model.h

@@ -46,13 +46,10 @@ class ManagePasswordsBubbleModel {
   // by the user.
   void OnNeverForThisSiteClicked();
 
-  // Called by the view code when username is corrected using the edit button
-  // in PendingView.
-  void OnUsernameEdited(base::string16 new_username);
-
-  // Called by the view code when a password is selected from the dropdown list
-  // of the password selection feature in PendingView.
-  void OnPasswordSelected(base::string16 new_password);
+  // Called by the view code when username or password is corrected using
+  // the username correction or password selection features in PendingView.
+  void OnCredentialEdited(base::string16 new_username,
+                          base::string16 new_password);
 
   // Called by the view code when the save button is clicked by the user.
   void OnSaveClicked();

chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc

@@ -329,6 +329,23 @@ TEST_F(ManagePasswordsBubbleModelTest, ClickUpdate) {
   DestroyModel();
 }
 
+TEST_F(ManagePasswordsBubbleModelTest, EditCredential) {
+  PretendPasswordWaiting();
+  EXPECT_CALL(*GetStore(), RemoveSiteStatsImpl(GURL(kSiteOrigin).GetOrigin()));
+
+  const base::string16 kExpectedUsername = base::UTF8ToUTF16("new_username");
+  const base::string16 kExpectedPassword = base::UTF8ToUTF16("new_password");
+
+  model()->OnCredentialEdited(kExpectedUsername, kExpectedPassword);
+  EXPECT_EQ(kExpectedUsername, model()->pending_password().username_value);
+  EXPECT_EQ(kExpectedPassword, model()->pending_password().password_value);
+  EXPECT_CALL(*controller(),
+              SavePassword(kExpectedUsername, kExpectedPassword));
+  EXPECT_CALL(*controller(), NeverSavePassword()).Times(0);
+  model()->OnSaveClicked();
+  DestroyModel();
+}
+
 TEST_F(ManagePasswordsBubbleModelTest, OnBrandLinkClicked) {
   PretendPasswordWaiting();