Fix current/new password assignment in iOS PasswordController

ios/chrome/browser/passwords/password_controller.mm

 // Copyright 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.
 
 #import "ios/chrome/browser/passwords/password_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 673 matching lines @@
 
   // Determine which password is the main one, and which is
   // an old password (e.g on a "make new password" form), if any.
   // TODO(crbug.com/564578): Make this compatible with other platforms.
   switch (passwordCount) {
     case 1:
       form->password_element = elements[0];
       form->password_value = values[0];
       break;
     case 2: {
       if (values[0] == values[1]) {

[dvadym, 2016/07/05 15:42:18]

Could you please add check if values are empty as in upstream
https://cs.chromium.org/chromium/src/components/autofill/content/renderer/pas...
?

[Jackie Quinn, 2016/07/06 07:39:28]

Done.

-        // Treat two identical passwords as a single password.
+        // Treat two identical passwords as a single password new password, with
+        // confirmation. This can be either be a sign-up form or a password
+        // change form that does not ask for a new password.
+        form->new_password_element = elements[0];
+        form->new_password_value = values[0];
+      } else {
+        // Assume first is old password, second is new (no choice but to guess).
         form->password_element = elements[0];
         form->password_value = values[0];
-      } else {
-        // Assume first is old password, second is new (no choice but to guess).
-        form->new_password_element = elements[0];
-        form->new_password_value = values[0];
-        form->password_element = elements[1];
-        form->password_value = values[1];
+        form->new_password_element = elements[1];
+        form->new_password_value = values[1];
       }
       break;
       default:
         if (values[0] == values[1] && values[0] == values[2]) {
-          // All three passwords the same? Just treat as one and hope.
+          // All three passwords the same? This does not make sense, do not

[dvadym, 2016/07/05 15:42:18]

Could you please add check if values are empty as in upstream
https://cs.chromium.org/chromium/src/components/autofill/content/renderer/pas...
?

[Jackie Quinn, 2016/07/06 07:39:28]

Done.

+          // add the password element.
+          break;
+        } else if (values[0] == values[1]) {
+          // First two the same and the third different implies that the old
+          // password is the duplicated one.
           form->password_element = elements[0];
           form->password_value = values[0];
-        } else if (values[0] == values[1]) {
-          // Two the same and one different -> old password is the duplicated
-          // one.
-          form->new_password_element = elements[0];
-          form->new_password_value = values[0];
-          form->password_element = elements[2];
-          form->password_value = values[2];
+          form->new_password_element = elements[2];
+          form->new_password_value = values[2];
         } else if (values[1] == values[2]) {
           // Two the same and one different -> new password is the duplicated
           // one.
-          form->new_password_element = elements[0];
-          form->new_password_value = values[0];
-          form->password_element = elements[1];
-          form->password_value = values[1];
+          form->password_element = elements[0];
+          form->password_value = values[0];
+          form->new_password_element = elements[1];
+          form->new_password_value = values[1];
         } else {
           // Three different passwords, or first and last match with middle
           // different. No idea which is which, so no luck.
         }
         break;
     }
   }
 
   // Fill in as much data about the fields as is required for password
   // generation.
@@ skipping 88 matching lines @@
 
 - (PasswordManager*)passwordManager {
   return passwordManager_.get();
 }
 
 - (JsPasswordManager*)passwordJsManager {
   return passwordJsManager_;
 }
 
 @end