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

Unified Diff: net/websockets/websocket_handshake_challenge.cc

Issue 683033003: Rename websocket_handshake_handler.* to websocket_handshake_challenge.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change calling convention of ComputeSecWebSocketAccept Created 6 years, 1 month 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/websockets/websocket_handshake_challenge.cc
diff --git a/net/websockets/websocket_handshake_handler.cc b/net/websockets/websocket_handshake_challenge.cc
similarity index 53%
rename from net/websockets/websocket_handshake_handler.cc
rename to net/websockets/websocket_handshake_challenge.cc
index 6bcc2304cc057a7a579936cd4dbd530eb33de140..369b519e19d4e697ff59c5196094964e37077f2d 100644
--- a/net/websockets/websocket_handshake_handler.cc
+++ b/net/websockets/websocket_handshake_challenge.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "net/websockets/websocket_handshake_handler.h"
+#include "net/websockets/websocket_handshake_challenge.h"
#include "base/base64.h"
#include "base/logging.h"
wtc 2014/11/12 20:11:55 Nit: "base/logging.h" can be omitted.
Adam Rice 2014/11/13 15:24:38 Thanks. Done.
@@ -11,13 +11,11 @@
namespace net {
-void ComputeSecWebSocketAccept(const std::string& key,
- std::string* accept) {
- DCHECK(accept);
-
- std::string hash =
- base::SHA1HashString(key + websockets::kWebSocketGuid);
- base::Base64Encode(hash, accept);
+std::string ComputeSecWebSocketAccept(const std::string& key) {
+ std::string accept;
+ std::string hash = base::SHA1HashString(key + websockets::kWebSocketGuid);
+ base::Base64Encode(hash, &accept);
+ return accept;
}
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698