| 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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 if (wallet_.readEntry(folder_name, key, &value)) { | 413 if (wallet_.readEntry(folder_name, key, &value)) { |
| 414 response = dbus::Response::CreateEmpty(); | 414 response = dbus::Response::CreateEmpty(); |
| 415 dbus::MessageWriter writer(response.get()); | 415 dbus::MessageWriter writer(response.get()); |
| 416 writer.AppendArrayOfBytes(value.data(), value.size()); | 416 writer.AppendArrayOfBytes(value.data(), value.size()); |
| 417 } | 417 } |
| 418 } else if (method_call->GetMember() == "writeEntry") { | 418 } else if (method_call->GetMember() == "writeEntry") { |
| 419 dbus::MessageReader reader(method_call); | 419 dbus::MessageReader reader(method_call); |
| 420 int handle = NativeBackendKWalletStub::kInvalidKWalletHandle; | 420 int handle = NativeBackendKWalletStub::kInvalidKWalletHandle; |
| 421 std::string folder_name; | 421 std::string folder_name; |
| 422 std::string key; | 422 std::string key; |
| 423 uint8_t* bytes = NULL; | 423 const uint8_t* bytes = NULL; |
| 424 size_t length = 0; | 424 size_t length = 0; |
| 425 std::string app_name; | 425 std::string app_name; |
| 426 EXPECT_TRUE(reader.PopInt32(&handle)); | 426 EXPECT_TRUE(reader.PopInt32(&handle)); |
| 427 EXPECT_TRUE(reader.PopString(&folder_name)); | 427 EXPECT_TRUE(reader.PopString(&folder_name)); |
| 428 EXPECT_TRUE(reader.PopString(&key)); | 428 EXPECT_TRUE(reader.PopString(&key)); |
| 429 EXPECT_TRUE(reader.PopArrayOfBytes(&bytes, &length)); | 429 EXPECT_TRUE(reader.PopArrayOfBytes(&bytes, &length)); |
| 430 EXPECT_TRUE(reader.PopString(&app_name)); | 430 EXPECT_TRUE(reader.PopString(&app_name)); |
| 431 EXPECT_NE(NativeBackendKWalletStub::kInvalidKWalletHandle, handle); | 431 EXPECT_NE(NativeBackendKWalletStub::kInvalidKWalletHandle, handle); |
| 432 response = dbus::Response::CreateEmpty(); | 432 response = dbus::Response::CreateEmpty(); |
| 433 dbus::MessageWriter writer(response.get()); | 433 dbus::MessageWriter writer(response.get()); |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1080 CheckVersion0Pickle(true, PasswordForm::SCHEME_BASIC); | 1080 CheckVersion0Pickle(true, PasswordForm::SCHEME_BASIC); |
| 1081 } | 1081 } |
| 1082 | 1082 |
| 1083 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTMLPickles) { | 1083 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTMLPickles) { |
| 1084 CheckVersion0Pickle(false, PasswordForm::SCHEME_HTML); | 1084 CheckVersion0Pickle(false, PasswordForm::SCHEME_HTML); |
| 1085 } | 1085 } |
| 1086 | 1086 |
| 1087 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTTPPickles) { | 1087 TEST_F(NativeBackendKWalletPickleTest, ReadsOld64BitHTTPPickles) { |
| 1088 CheckVersion0Pickle(false, PasswordForm::SCHEME_BASIC); | 1088 CheckVersion0Pickle(false, PasswordForm::SCHEME_BASIC); |
| 1089 } | 1089 } |
| OLD | NEW |