Revert 65313 - flip_in_mem_edsm_server builds again....

net/tools/flip_server/balsa_headers.cc

 // Copyright (c) 2009 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 "net/tools/flip_server/balsa_headers.h"
 
 #include <emmintrin.h>
 
 #include <algorithm>
+#include <ext/hash_set>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/port.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "net/tools/flip_server/balsa_enums.h"
 #include "net/tools/flip_server/buffer_interface.h"
 #include "net/tools/flip_server/simple_buffer.h"
 #include "third_party/tcmalloc/chromium/src/base/googleinit.h"
 // #include "util/gtl/iterator_adaptors-inl.h"
 // #include "util/gtl/map-util.h"
 
 namespace {
 
 const char kContentLength[] = "Content-Length";
 const char kTransferEncoding[] = "Transfer-Encoding";
 const char kSpaceChar = ' ';
 
-base::hash_set<base::StringPiece,
-               net::StringPieceCaseHash,
-               net::StringPieceCaseEqual> g_multivalued_headers;
+__gnu_cxx::hash_set<base::StringPiece,
+                    net::StringPieceCaseHash,
+                    net::StringPieceCaseEqual> g_multivalued_headers;
 
 void InitMultivaluedHeaders() {
   g_multivalued_headers.insert("accept");
   g_multivalued_headers.insert("accept-charset");
   g_multivalued_headers.insert("accept-encoding");
   g_multivalued_headers.insert("accept-language");
   g_multivalued_headers.insert("accept-ranges");
   g_multivalued_headers.insert("allow");
   g_multivalued_headers.insert("cache-control");
   g_multivalued_headers.insert("connection");
@@ skipping 563 matching lines @@
   } else if (transfer_encoding_is_chunked_) {
     const base::StringPiece transfer_encoding(kTransferEncoding,
                                         sizeof(kTransferEncoding) - 1);
     RemoveAllOfHeader(transfer_encoding);
     transfer_encoding_is_chunked_ = false;
   }
   content_length_status_ = BalsaHeadersEnums::VALID_CONTENT_LENGTH;
   content_length_ = length;
   // FastUInt64ToBuffer is supposed to use a maximum of kFastToBufferSize bytes.
   char buffer[kFastToBufferSize];
-  int len_converted = snprintf(buffer, sizeof(buffer), "%zu", length);
+  int len_converted = snprintf(buffer, sizeof(buffer), "%d", length);
   CHECK_GT(len_converted, 0);
   const base::StringPiece length_str(buffer, len_converted);
   AppendHeader(content_length, length_str);
 }
 
 void BalsaHeaders::SetChunkEncoding(bool chunk_encode) {
   if (transfer_encoding_is_chunked_ == chunk_encode) {
     return;
   }
   if (content_length_status_ != BalsaHeadersEnums::NO_CONTENT_LENGTH &&
@@ skipping 88 matching lines @@
   // Thus, a function to set one is equivalent to a function to set the other.
   // We maintain two functions for this as it is much more descriptive, and
   // makes code more understandable.
   SetRequestUri(code);
 }
 
 void BalsaHeaders::SetParsedResponseCodeAndUpdateFirstline(
     size_t parsed_response_code) {
   char buffer[kFastToBufferSize];
   int len_converted = snprintf(buffer, sizeof(buffer),
-                               "%zu", parsed_response_code);
+                               "%d", parsed_response_code);
   CHECK_GT(len_converted, 0);
   SetResponseCode(base::StringPiece(buffer, len_converted));
 }
 
 void BalsaHeaders::SetRequestVersion(const base::StringPiece& version) {
   // This is the last of the three parts of the firstline.
   // Since whitespace_3_idx and non_whitespace_3_idx may point to the same
   // place, we ensure below that any available space includes space for a
   // litteral space (' ') character between the second component and the third
   // component. If the space between whitespace_3_idx_ and
@@ skipping 16 matching lines @@
 
 void BalsaHeaders::SetResponseReasonPhrase(const base::StringPiece& reason) {
   // Note: There is no difference between request_version() and
   // response_reason_phrase(). Thus, a function to set one is equivalent to a
   // function to set the other. We maintain two functions for this as it is
   // much more descriptive, and makes code more understandable.
   SetRequestVersion(reason);
 }
 
 }  // namespace net