Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / websockets / websocket_handshake_handler.cc

diff --git a/src/net/websockets/websocket_handshake_handler.cc b/src/net/websockets/websocket_handshake_handler.cc
index 641b196..6324710 100644 (file)
--- a/src/net/websockets/websocket_handshake_handler.cc
+++ b/src/net/websockets/websocket_handshake_handler.cc
@@ -270,14 +270,14 @@ bool WebSocketHandshakeRequestHandler::GetRequestHeaderBlock(
       // SPDY. We should omit them from a Sec-WebSocket-Extension header.
       std::string name;
       if (spdy_protocol_version <= 2)
-        name = StringToLowerASCII(iter.name());
+        name = base::StringToLowerASCII(iter.name());
       else
-        name = ":" + StringToLowerASCII(iter.name());
+        name = ":" + base::StringToLowerASCII(iter.name());
       (*headers)[name] = iter.values();
       continue;
     }
     // Others should be sent out to |headers|.
-    std::string name = StringToLowerASCII(iter.name());
+    std::string name = base::StringToLowerASCII(iter.name());
     SpdyHeaderBlock::iterator found = headers->find(name);
     if (found == headers->end()) {
       (*headers)[name] = iter.values();
@@ -351,8 +351,7 @@ void ComputeSecWebSocketAccept(const std::string& key,
 
   std::string hash =
       base::SHA1HashString(key + websockets::kWebSocketGuid);
-  bool encode_success = base::Base64Encode(hash, accept);
-  DCHECK(encode_success);
+  base::Base64Encode(hash, accept);
 }
 
 bool WebSocketHandshakeResponseHandler::ParseResponseInfo(
@@ -405,8 +404,7 @@ bool WebSocketHandshakeResponseHandler::ParseResponseHeaderBlock(
   std::string hash =
       base::SHA1HashString(challenge + websockets::kWebSocketGuid);
   std::string websocket_accept;
-  bool encode_success = base::Base64Encode(hash, &websocket_accept);
-  DCHECK(encode_success);
+  base::Base64Encode(hash, &websocket_accept);
 
   std::string response_message = base::StringPrintf(
       "%s %s\r\n", websockets::kHttpProtocolVersion, status->second.c_str());