| 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" |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 EXPECT_TRUE(envs.empty()); | 308 EXPECT_TRUE(envs.empty()); |
| 309 EXPECT_TRUE(startup_id.empty()); | 309 EXPECT_TRUE(startup_id.empty()); |
| 310 EXPECT_FALSE(blind); | 310 EXPECT_FALSE(blind); |
| 311 | 311 |
| 312 if (kwallet_runnable_) | 312 if (kwallet_runnable_) |
| 313 kwallet_running_ = true; | 313 kwallet_running_ = true; |
| 314 | 314 |
| 315 scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty()); | 315 scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty()); |
| 316 dbus::MessageWriter writer(response.get()); | 316 dbus::MessageWriter writer(response.get()); |
| 317 writer.AppendInt32(klauncher_ret_); | 317 writer.AppendInt32(klauncher_ret_); |
| 318 writer.AppendString(""); // dbus_name | 318 writer.AppendString(std::string()); // dbus_name |
| 319 writer.AppendString(klauncher_error_); | 319 writer.AppendString(klauncher_error_); |
| 320 writer.AppendInt32(1234); // pid | 320 writer.AppendInt32(1234); // pid |
| 321 return response.release(); | 321 return response.release(); |
| 322 } | 322 } |
| 323 | 323 |
| 324 dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( | 324 dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( |
| 325 dbus::MethodCall* method_call, testing::Unused) { | 325 dbus::MethodCall* method_call, testing::Unused) { |
| 326 if (!kwallet_running_) | 326 if (!kwallet_running_) |
| 327 return NULL; | 327 return NULL; |
| 328 EXPECT_EQ("org.kde.KWallet", method_call->GetInterface()); | 328 EXPECT_EQ("org.kde.KWallet", method_call->GetInterface()); |
| (...skipping 750 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 |