Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / components / rappor / bloom_filter.cc

diff --git a/src/components/rappor/bloom_filter.cc b/src/components/rappor/bloom_filter.cc
index 2880ae0..d3f9e63 100644 (file)
--- a/src/components/rappor/bloom_filter.cc
+++ b/src/components/rappor/bloom_filter.cc
@@ -5,9 +5,7 @@
 #include "components/rappor/bloom_filter.h"
 
 #include "base/logging.h"
-
-// TODO(holte): we can't include "City.h" due to typedef conflicts.
-extern uint64 CityHash64WithSeed(const char *buf, size_t len, uint64 seed);
+#include "third_party/smhasher/src/City.h"
 
 namespace rappor {