diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 18:14:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 18:14:57 +0000 |
| commit | d9806a97728e34d79a34d2d7a04dfa6048ad048c (patch) | |
| tree | 8c71ff87111e177731fd02101f05bdd354cb336d /net/websockets/websocket_frame_parser.cc | |
| parent | 9ea8ec9f63db0b2473b4a84648cebce4e0bfcf93 (diff) | |
| download | chromium_src-d9806a97728e34d79a34d2d7a04dfa6048ad048c.zip chromium_src-d9806a97728e34d79a34d2d7a04dfa6048ad048c.tar.gz chromium_src-d9806a97728e34d79a34d2d7a04dfa6048ad048c.tar.bz2 | |
ui/base/resource: Remove dependency on net's big_endian implementation.
To remove this dependency we ended up moving big_endian* to base/, since besides ui/,
big_endian is also used by other top-level modules: chrome/utility/, cloud_print, media/cast
This way we removed one more net dependency from ui/base/.
BUG=299841
TEST=ui_unittests
R=tony@chromium.org,mark@chromium.org,hclam@chromium.org,vitalybuka@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/145873006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_frame_parser.cc')
| -rw-r--r-- | net/websockets/websocket_frame_parser.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/websockets/websocket_frame_parser.cc b/net/websockets/websocket_frame_parser.cc index 3b19912..2e4c58f 100644 --- a/net/websockets/websocket_frame_parser.cc +++ b/net/websockets/websocket_frame_parser.cc @@ -8,11 +8,11 @@ #include <limits> #include "base/basictypes.h" +#include "base/big_endian.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "net/base/big_endian.h" #include "net/base/io_buffer.h" #include "net/websockets/websocket_frame.h" @@ -124,7 +124,7 @@ void WebSocketFrameParser::DecodeFrameHeader() { if (end - current < 2) return; uint16 payload_length_16; - ReadBigEndian(current, &payload_length_16); + base::ReadBigEndian(current, &payload_length_16); current += 2; payload_length = payload_length_16; if (payload_length <= kMaxPayloadLengthWithoutExtendedLengthField) @@ -132,7 +132,7 @@ void WebSocketFrameParser::DecodeFrameHeader() { } else if (payload_length == kPayloadLengthWithEightByteExtendedLengthField) { if (end - current < 8) return; - ReadBigEndian(current, &payload_length); + base::ReadBigEndian(current, &payload_length); current += 8; if (payload_length <= kuint16max || payload_length > static_cast<uint64>(kint64max)) { |