| commit | 674f0eb973b8ebf08f9abcb45b2271dc510aa2cf | [log] [tgz] |
|---|---|---|
| author | Alex Vakulenko <avakulenko@google.com> | Wed Jan 20 08:10:48 2016 -0800 |
| committer | Alex Vakulenko <avakulenko@google.com> | Wed Jan 20 21:14:44 2016 +0000 |
| tree | 250959a0e31c60721908968edb3025c8d9250d1c | |
| parent | bcd3f6a43fe40184fb5d30860c6a2cf9f9e7a11e [diff] [blame] |
Pull the new r369476 of base library from Chromium The merge was done against r369476 which corresponds to git commit 0471d0e2e2ef4a544a63481a389e1df33ea7c00a of Jan 14, 2016 Change-Id: Ie6894cf65424cc5ad115110faccd51602b2d1234 Reviewed-on: https://weave-review.googlesource.com/2225 Reviewed-by: Alex Vakulenko <avakulenko@google.com>
diff --git a/third_party/chromium/base/json/json_writer.h b/third_party/chromium/base/json/json_writer.h index 5711665..ef43341 100644 --- a/third_party/chromium/base/json/json_writer.h +++ b/third_party/chromium/base/json/json_writer.h
@@ -5,10 +5,12 @@ #ifndef BASE_JSON_JSON_WRITER_H_ #define BASE_JSON_JSON_WRITER_H_ +#include <stddef.h> + #include <string> #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" namespace base {