Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(739)

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 1076063002: Remove certificates from Channel ID (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 19e5e8d6464aeeb2ee42cc2bb7fd59c77069c53b..762917b60cb1c56908ecf7d6ea0afe9777400b3c 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -622,17 +622,11 @@ class DeleteSocketCallback : public TestCompletionCallbackBase {
// channel id.
class FailingChannelIDStore : public ChannelIDStore {
int GetChannelID(const std::string& server_identifier,
- base::Time* expiration_time,
- std::string* private_key_result,
- std::string* cert_result,
+ scoped_ptr<crypto::ECPrivateKey>* key_result,
const GetChannelIDCallback& callback) override {
return ERR_UNEXPECTED;
}
- void SetChannelID(const std::string& server_identifier,
- base::Time creation_time,
- base::Time expiration_time,
- const std::string& private_key,
- const std::string& cert) override {}
+ void SetChannelID(scoped_ptr<ChannelID> channel_id) override {}
void DeleteChannelID(const std::string& server_identifier,
const base::Closure& completion_callback) override {}
void DeleteAllCreatedBetween(
@@ -649,20 +643,15 @@ class FailingChannelIDStore : public ChannelIDStore {
// channel id.
class AsyncFailingChannelIDStore : public ChannelIDStore {
int GetChannelID(const std::string& server_identifier,
- base::Time* expiration_time,
- std::string* private_key_result,
- std::string* cert_result,
+ scoped_ptr<crypto::ECPrivateKey>* key_result,
const GetChannelIDCallback& callback) override {
base::MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(callback, ERR_UNEXPECTED,
- server_identifier, base::Time(), "", ""));
+ FROM_HERE,
+ base::Bind(callback, ERR_UNEXPECTED, server_identifier,
+ base::Passed(scoped_ptr<crypto::ECPrivateKey>())));
return ERR_IO_PENDING;
}
- void SetChannelID(const std::string& server_identifier,
- base::Time creation_time,
- base::Time expiration_time,
- const std::string& private_key,
- const std::string& cert) override {}
+ void SetChannelID(scoped_ptr<ChannelID> channel_id) override {}
void DeleteChannelID(const std::string& server_identifier,
const base::Closure& completion_callback) override {}
void DeleteAllCreatedBetween(

Powered by Google App Engine
This is Rietveld 408576698