Revert 65313 - flip_in_mem_edsm_server builds again.

BUG=None
TEST=It builds.

Review URL: http://codereview.chromium.org/4094002

TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/4541002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65314 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 9 deletions

diff --git a/net/tools/flip_server/balsa_headers.cc b/net/tools/flip_server/balsa_headers.cc
index 8d997c2..dfdbb61 100644
--- a/net/tools/flip_server/balsa_headers.cc
+++ b/net/tools/flip_server/balsa_headers.cc
@@ -7,11 +7,11 @@
 #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"
@@ -29,9 +29,9 @@ 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");
@@ -615,7 +615,7 @@ void BalsaHeaders::SetContentLength(size_t 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);
@@ -724,7 +724,7 @@ 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));
 }
diff --git a/net/tools/flip_server/epoll_server.h b/net/tools/flip_server/epoll_server.h
index abadaff..bbcb188 100644
--- a/net/tools/flip_server/epoll_server.h
+++ b/net/tools/flip_server/epoll_server.h
@@ -8,6 +8,8 @@
 
 #include <fcntl.h>
 #include <sys/queue.h>
+#include <ext/hash_map>  // it is annoying that gcc does this. oh well.
+#include <ext/hash_set>
 #include <map>
 #include <string>
 #include <utility>
@@ -34,7 +36,6 @@
 #endif
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include <sys/epoll.h>
 
@@ -573,7 +574,7 @@ class EpollServer {
     }
   };
 
-  typedef base::hash_set<CBAndEventMask, CBAndEventMaskHash> FDToCBMap;
+  typedef __gnu_cxx::hash_set<CBAndEventMask, CBAndEventMaskHash> FDToCBMap;
 
   // the following four functions are OS-specific, and are likely
   // to be changed in a subclass if the poll/select method is changed
@@ -942,7 +943,7 @@ class EpollServer {
 
     std::vector<DebugOutput*> debug_events_;
     std::vector<Events> unregistered_fds_;
-    typedef base::hash_map<int, Events> EventCountsMap;
+    typedef __gnu_cxx::hash_map<int, Events> EventCountsMap;
     EventCountsMap event_counts_;
     int64 num_records_;
     int64 record_threshold_;
diff --git a/net/tools/flip_server/other_defines.h b/net/tools/flip_server/other_defines.h
index 2dd8103..dda2151 100644
--- a/net/tools/flip_server/other_defines.h
+++ b/net/tools/flip_server/other_defines.h
@@ -13,5 +13,9 @@ class NullStream {
   NullStream operator<<(T t) { return *this;}
 };
 
+#define VLOG(X) NullStream()
+#define DVLOG(X) NullStream()
+
+
 #endif  // NET_TOOLS_FLIP_SERVER_OTHER_DEFINES