| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <map> | 6 #include <map> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/pickle.h" | 11 #include "base/pickle.h" |
| 12 #include "base/prefs/pref_service.h" |
| 12 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
| 13 #include "base/synchronization/waitable_event.h" | 14 #include "base/synchronization/waitable_event.h" |
| 14 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 15 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" | 16 #include "chrome/browser/password_manager/native_backend_kwallet_x.h" |
| 16 #include "chrome/browser/prefs/pref_service.h" | |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
| 19 #include "content/public/test/test_browser_thread.h" | 19 #include "content/public/test/test_browser_thread.h" |
| 20 #include "dbus/message.h" | 20 #include "dbus/message.h" |
| 21 #include "dbus/mock_bus.h" | 21 #include "dbus/mock_bus.h" |
| 22 #include "dbus/mock_object_proxy.h" | 22 #include "dbus/mock_object_proxy.h" |
| 23 #include "dbus/object_path.h" | 23 #include "dbus/object_path.h" |
| 24 #include "dbus/object_proxy.h" | 24 #include "dbus/object_proxy.h" |
| 25 #include "testing/gmock/include/gmock/gmock.h" | 25 #include "testing/gmock/include/gmock/gmock.h" |
| 26 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1079 CheckVersion0Pickle(true, PasswordForm::SCHEME_BASIC); | 1079 CheckVersion0Pickle(true, PasswordForm::SCHEME_BASIC); |
| 1080 } | 1080 } |
| 1081 | 1081 |
| 1082 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTMLPickles) { | 1082 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTMLPickles) { |
| 1083 CheckVersion0Pickle(false, PasswordForm::SCHEME_HTML); | 1083 CheckVersion0Pickle(false, PasswordForm::SCHEME_HTML); |
| 1084 } | 1084 } |
| 1085 | 1085 |
| 1086 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTTPPickles) { | 1086 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTTPPickles) { |
| 1087 CheckVersion0Pickle(false, PasswordForm::SCHEME_BASIC); | 1087 CheckVersion0Pickle(false, PasswordForm::SCHEME_BASIC); |
| 1088 } | 1088 } |
| OLD | NEW |