| Index: components/rappor/bloom_filter.cc
|
| diff --git a/components/rappor/bloom_filter.cc b/components/rappor/bloom_filter.cc
|
| index 2880ae094096f26755115b65b943496843d134ed..d3f9e6339328714bc301237173e4f93baee96fee 100644
|
| --- a/components/rappor/bloom_filter.cc
|
| +++ b/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 {
|
|
|
|
|