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

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: Created 5 years, 8 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 578456add59533a62a6da4152e8cfd3ea3d3ab55..28196bdfb21f277d18024437242414ffddec2e05 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -619,17 +619,15 @@ 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,
+ std::string* public_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 {}
+ const std::string& public_key) override {}
void DeleteChannelID(const std::string& server_identifier,
const base::Closure& completion_callback) override {}
void DeleteAllCreatedBetween(
@@ -646,20 +644,18 @@ 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,
+ std::string* public_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, "", ""));
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 {}
+ const std::string& public_key) 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