| commit | ea94afc23c664ca6354c2778734e55e7de27748a | [log] [tgz] |
|---|---|---|
| author | tfarina <[email protected]> | Tue Oct 20 04:23:36 2015 |
| committer | Commit bot <[email protected]> | Tue Oct 20 04:24:28 2015 |
| tree | ef4532a23f6a9bb64d41dc696284be6bfdc3a544 | |
| parent | c2572edcdfea2fee18e91789f594b0ebacaa24fc [diff] [blame] |
net/websockets: Remove basictypes.h includes. When necessary use either macros.h or stddef.h. BUG=138542, 487868, 488550, 539734 TEST=net_unittests [email protected],[email protected],[email protected] Review URL: https://codereview.chromium.org/1409343003 Cr-Commit-Position: refs/heads/master@{#354974}
diff --git a/net/websockets/websocket_test_util.cc b/net/websockets/websocket_test_util.cc index fc494e6..097bab8c 100644 --- a/net/websockets/websocket_test_util.cc +++ b/net/websockets/websocket_test_util.cc
@@ -4,10 +4,10 @@ #include "net/websockets/websocket_test_util.h" +#include <stddef.h> #include <algorithm> #include <vector> -#include "base/basictypes.h" #include "base/memory/scoped_vector.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" @@ -18,6 +18,7 @@ namespace net { namespace { + const uint64_t kA = (static_cast<uint64_t>(0x5851f42d) << 32) + static_cast<uint64_t>(0x4c957f2d); const uint64_t kC = 12345;