Remove PasswordForm::ssl_valid

chrome/browser/password_manager/native_backend_kwallet_x_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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 228 matching lines @@
     const PasswordForm& actual,
     bool check_date_created) {
   EXPECT_EQ(expected.origin, actual.origin);
   EXPECT_EQ(expected.password_value, actual.password_value);
   EXPECT_EQ(expected.action, actual.action);
   EXPECT_EQ(expected.username_element, actual.username_element);
   EXPECT_EQ(expected.username_value, actual.username_value);
   EXPECT_EQ(expected.password_element, actual.password_element);
   EXPECT_EQ(expected.submit_element, actual.submit_element);
   EXPECT_EQ(expected.signon_realm, actual.signon_realm);
-  EXPECT_EQ(expected.ssl_valid, actual.ssl_valid);
   EXPECT_EQ(expected.preferred, actual.preferred);
   if (check_date_created) {
     EXPECT_EQ(expected.date_created, actual.date_created);
   }
   EXPECT_EQ(expected.blacklisted_by_user, actual.blacklisted_by_user);
   EXPECT_EQ(expected.type, actual.type);
   EXPECT_EQ(expected.times_used, actual.times_used);
   EXPECT_EQ(expected.scheme, actual.scheme);
   EXPECT_EQ(expected.date_synced, actual.date_synced);
   EXPECT_EQ(expected.display_name, actual.display_name);
@@ skipping 905 matching lines @@
   // most cases the two versions should be the same.
   void CreateVersion1PlusPickle(const PasswordForm& form,
                                 base::Pickle* pickle,
                                 int stored_version,
                                 int effective_version);
   // If |size_32| is true, stores the number of forms in the pickle as a 32bit
   // uint, otherwise as 64 bit size_t.
   void CreateVersion0Pickle(bool size_32,
                             const PasswordForm& form,
                             base::Pickle* pickle);
+  void CheckVersion9Pickle();
   void CheckVersion8Pickle();
   void CheckVersion7Pickle();
   // As explained in http://crbug.com/494229#c11, version 6 added a new optional
   // field to version 5. This field became required in version 7. Depending on
   // |with_optional_field|, this method checks deserialization with or without
   // the optional field.
   void CheckVersion6Pickle(bool with_optional_field);
   void CheckVersion5Pickle();
   void CheckVersion3Pickle();
   void CheckVersion2Pickle();
   void CheckVersion1Pickle();
   void CheckVersion0Pickle(bool size_32, PasswordForm::Scheme scheme);
 };
 
 void NativeBackendKWalletPickleTest::CreateVersion1PlusPickle(
     const PasswordForm& form,
     base::Pickle* pickle,
     int stored_version,
     int effective_version) {
   pickle->WriteInt(stored_version);
   pickle->WriteUInt64(1);  // Number of forms in the pickle.
   WriteHTMLAttributes(form, pickle);
-  pickle->WriteBool(form.ssl_valid);
+  if (effective_version < 9)
+    pickle->WriteBool(true);  // Unused flag.
   WritePreferenceMetadata(form, pickle);
   pickle->WriteInt64(form.date_created.ToInternalValue());
   if (effective_version < 2)
     return;
   pickle->WriteInt(form.type);
   pickle->WriteInt(form.times_used);
   autofill::SerializeFormData(form.form_data, pickle);
   if (effective_version < 3)
     return;
   pickle->WriteInt64(form.date_synced.ToInternalValue());
@@ skipping 12 matching lines @@
     bool size_32,
     const PasswordForm& form,
     base::Pickle* pickle) {
   pickle->WriteInt(0);
   // Write the number of forms in the pickle in the appopriate bit size.
   if (size_32)
     pickle->WriteUInt32(1);
   else
     pickle->WriteUInt64(1);
   WriteHTMLAttributes(form, pickle);
-  pickle->WriteBool(form.ssl_valid);
+  pickle->WriteBool(true);  // Unused flag.
   WritePreferenceMetadata(form, pickle);
   // Old way to store the date.
   pickle->WriteInt64(form.date_created.ToTimeT());
 }
 
+void NativeBackendKWalletPickleTest::CheckVersion9Pickle() {
+  // Pickle 9+ dropped an old flag in the middle of PasswordForm. This test
+  // makes sure that the attributes after the dropped flag are deserialised
+  // correctly.
+  base::Pickle pickle;
+  PasswordForm default_values;
+  PasswordForm form = form_google_;
+
+  CreateVersion1PlusPickle(form, &pickle, 9, 9);
+  ScopedVector<PasswordForm> form_list =
+      NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
+  EXPECT_EQ(1u, form_list.size());
+  if (form_list.size() > 0)
+    CheckPasswordForm(form, *form_list[0], true);
+}
+
 void NativeBackendKWalletPickleTest::CheckVersion8Pickle() {
   base::Pickle pickle;
   PasswordForm default_values;
   PasswordForm form = form_google_;
 
   // Version 8 pickles deserialize with their own 'skip_zero_click' value.
   form.skip_zero_click = false;
   CreateVersion1PlusPickle(form, &pickle, 8, 8);
   ScopedVector<PasswordForm> form_list =
       NativeBackendKWalletStub::DeserializeValue(form.signon_realm, pickle);
@@ skipping 162 matching lines @@
   CheckVersion6Pickle(true);
 }
 
 TEST_F(NativeBackendKWalletPickleTest, CheckVersion7Pickle) {
   CheckVersion7Pickle();
 }
 
 TEST_F(NativeBackendKWalletPickleTest, CheckVersion8Pickle) {
   CheckVersion8Pickle();
 }
+
+TEST_F(NativeBackendKWalletPickleTest, CheckVersion9Pickle) {
+  CheckVersion9Pickle();
+}