Revert 239921 "Revert 239759 "The comment in base64.h implies th..."

trunk/src/chrome/test/chromedriver/net/websocket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/net/websocket.h"
 
 #include <string.h>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 103 matching lines @@
   Write(header_str + masked_message);
   return true;
 }
 
 void WebSocket::OnSocketConnect(int code) {
   if (code != net::OK) {
     Close(code);
     return;
   }
 
-  CHECK(base::Base64Encode(base::RandBytesAsString(16), &sec_key_));
+  base::Base64Encode(base::RandBytesAsString(16), &sec_key_);
   std::string handshake = base::StringPrintf(
       "GET %s HTTP/1.1\r\n"
       "Host: %s\r\n"
       "Upgrade: websocket\r\n"
       "Connection: Upgrade\r\n"
       "Sec-WebSocket-Key: %s\r\n"
       "Sec-WebSocket-Version: 13\r\n"
       "Pragma: no-cache\r\n"
       "Cache-Control: no-cache\r\n"
       "\r\n",
@@ skipping 68 matching lines @@
 
 void WebSocket::OnReadDuringHandshake(const char* data, int len) {
   handshake_response_ += std::string(data, len);
   int headers_end = net::HttpUtil::LocateEndOfHeaders(
       handshake_response_.data(), handshake_response_.size(), 0);
   if (headers_end == -1)
     return;
 
   const char kMagicKey[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
   std::string websocket_accept;
-  CHECK(base::Base64Encode(base::SHA1HashString(sec_key_ + kMagicKey),
-                           &websocket_accept));
+  base::Base64Encode(base::SHA1HashString(sec_key_ + kMagicKey),
+                     &websocket_accept);
   scoped_refptr<net::HttpResponseHeaders> headers(
       new net::HttpResponseHeaders(
           net::HttpUtil::AssembleRawHeaders(
               handshake_response_.data(), headers_end)));
   if (headers->response_code() != 101 ||
       !headers->HasHeaderValue("Upgrade", "WebSocket") ||
       !headers->HasHeaderValue("Connection", "Upgrade") ||
       !headers->HasHeaderValue("Sec-WebSocket-Accept", websocket_accept)) {
     Close(net::ERR_FAILED);
     return;
@@ skipping 30 matching lines @@
 
 void WebSocket::Close(int code) {
   socket_->Disconnect();
   if (!connect_callback_.is_null())
     InvokeConnectCallback(code);
   if (state_ == OPEN)
     listener_->OnClose();
 
   state_ = CLOSED;
 }
-
-