| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1022 | 1022 |
| 1023 // Set the canonical forms to the updated value for the following comparison. | 1023 // Set the canonical forms to the updated value for the following comparison. |
| 1024 form_google_.skip_zero_click = true; | 1024 form_google_.skip_zero_click = true; |
| 1025 PasswordStoreChangeList expected_changes; | 1025 PasswordStoreChangeList expected_changes; |
| 1026 expected_changes.push_back( | 1026 expected_changes.push_back( |
| 1027 PasswordStoreChange(PasswordStoreChange::UPDATE, form_google_)); | 1027 PasswordStoreChange(PasswordStoreChange::UPDATE, form_google_)); |
| 1028 | 1028 |
| 1029 PasswordStoreChangeList changes; | 1029 PasswordStoreChangeList changes; |
| 1030 BrowserThread::PostTaskAndReplyWithResult( | 1030 BrowserThread::PostTaskAndReplyWithResult( |
| 1031 BrowserThread::DB, FROM_HERE, | 1031 BrowserThread::DB, FROM_HERE, |
| 1032 base::Bind(&NativeBackendKWallet::DisableAutoSignInForOrigins, | 1032 base::Bind( |
| 1033 base::Unretained(&backend), | 1033 &NativeBackendKWallet::DisableAutoSignInForOrigins, |
| 1034 base::Bind(&GURL::operator==, | 1034 base::Unretained(&backend), |
| 1035 base::Unretained(&form_google_.origin)), | 1035 base::Bind( |
| 1036 &changes), | 1036 static_cast<bool (*)(const GURL&, const GURL&)>(operator==), |
| 1037 form_google_.origin), |
| 1038 &changes), |
| 1037 base::Bind(&CheckPasswordChangesWithResult, &expected_changes, &changes)); | 1039 base::Bind(&CheckPasswordChangesWithResult, &expected_changes, &changes)); |
| 1038 RunDBThread(); | 1040 RunDBThread(); |
| 1039 | 1041 |
| 1040 std::vector<const PasswordForm*> forms; | 1042 std::vector<const PasswordForm*> forms; |
| 1041 forms.push_back(&form_google_); | 1043 forms.push_back(&form_google_); |
| 1042 ExpectationArray expected; | 1044 ExpectationArray expected; |
| 1043 expected.push_back(make_pair(std::string(form_google_.signon_realm), forms)); | 1045 expected.push_back(make_pair(std::string(form_google_.signon_realm), forms)); |
| 1044 forms.clear(); | 1046 forms.clear(); |
| 1045 forms.push_back(&form_isc_); | 1047 forms.push_back(&form_isc_); |
| 1046 expected.push_back(make_pair(std::string(form_isc_.signon_realm), forms)); | 1048 expected.push_back(make_pair(std::string(form_isc_.signon_realm), forms)); |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1431 CheckVersion7Pickle(); | 1433 CheckVersion7Pickle(); |
| 1432 } | 1434 } |
| 1433 | 1435 |
| 1434 TEST_F(NativeBackendKWalletPickleTest, CheckVersion8Pickle) { | 1436 TEST_F(NativeBackendKWalletPickleTest, CheckVersion8Pickle) { |
| 1435 CheckVersion8Pickle(); | 1437 CheckVersion8Pickle(); |
| 1436 } | 1438 } |
| 1437 | 1439 |
| 1438 TEST_F(NativeBackendKWalletPickleTest, CheckVersion9Pickle) { | 1440 TEST_F(NativeBackendKWalletPickleTest, CheckVersion9Pickle) { |
| 1439 CheckVersion9Pickle(); | 1441 CheckVersion9Pickle(); |
| 1440 } | 1442 } |
| OLD | NEW |