Revert "Revert 223907 "[password generation] Upload possible account cre...""

chrome/browser/password_manager/login_database_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/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
@@ skipping 23 matching lines @@
   }
 
   std::vector<string16> DeserializeVector(const Pickle& pickle) const {
     return db_.DeserializeVector(pickle);
   }
 
   void SetPublicSuffixMatching(bool enabled) {
     db_.public_suffix_domain_matching_ = enabled;
   }
 
+  void FormsAreEqual(const PasswordForm& expected, const PasswordForm& actual) {
+    PasswordForm expected_copy(expected);
+#if defined(OS_MACOSX)
+    // On the Mac we should never be storing passwords in the database.
+    expected_copy.password_value = ASCIIToUTF16("");
+#endif
+    EXPECT_EQ(expected_copy, actual);
+  }
+
   base::ScopedTempDir temp_dir_;
   base::FilePath file_;
   LoginDatabase db_;
 };
 
 TEST_F(LoginDatabaseTest, Logins) {
   std::vector<PasswordForm*> result;
 
   // Verify the database is empty.
   EXPECT_TRUE(db_.GetAutofillableLogins(&result));
   EXPECT_EQ(0U, result.size());
 
   // Example password form.
   PasswordForm form;
   form.origin = GURL("http://accounts.google.com/LoginAuth");
   form.action = GURL("http://accounts.google.com/Login");
   form.username_element = ASCIIToUTF16("Email");
   form.username_value = ASCIIToUTF16("test@gmail.com");
   form.password_element = ASCIIToUTF16("Passwd");
   form.password_value = ASCIIToUTF16("test");
   form.submit_element = ASCIIToUTF16("signIn");
   form.signon_realm = "http://www.google.com/";
   form.ssl_valid = false;
   form.preferred = false;
   form.scheme = PasswordForm::SCHEME_HTML;
+  form.times_used = 1;
+  form.form_data.name = ASCIIToUTF16("form_name");
+  form.form_data.method = ASCIIToUTF16("POST");
 
-  // Add it and make sure it is there.
+  // Add it and make sure it is there and that all the fields were retrieved
+  // correctly.
   EXPECT_TRUE(db_.AddLogin(form));
   EXPECT_TRUE(db_.GetAutofillableLogins(&result));
   EXPECT_EQ(1U, result.size());
+  FormsAreEqual(form, *result[0]);
   delete result[0];
   result.clear();
 
   // Match against an exact copy.
   EXPECT_TRUE(db_.GetLogins(form, &result));
   EXPECT_EQ(1U, result.size());
   delete result[0];
   result.clear();
 
   // The example site changes...
@@ skipping 537 matching lines @@
 //
 // Only POSIX because GetPosixFilePermissions() only exists on POSIX.
 // This tests that sql::Connection::set_restrict_to_user() was called,
 // and that function is a noop on non-POSIX platforms in any case.
 TEST_F(LoginDatabaseTest, FilePermissions) {
   int mode = file_util::FILE_PERMISSION_MASK;
   EXPECT_TRUE(file_util::GetPosixFilePermissions(file_, &mode));
   EXPECT_EQ((mode & file_util::FILE_PERMISSION_USER_MASK), mode);
 }
 #endif  // defined(OS_POSIX)