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
[email protected],[email protected],[email protected],[email protected]
[email protected]
Review URL: https://codereview.chromium.org/145873006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253510 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/dns/dns_query.cc b/net/dns/dns_query.cc
index 270757e7..530508a 100644
--- a/net/dns/dns_query.cc
+++ b/net/dns/dns_query.cc
@@ -6,8 +6,8 @@
#include <limits>
+#include "base/big_endian.h"
#include "base/sys_byteorder.h"
-#include "net/base/big_endian.h"
#include "net/base/dns_util.h"
#include "net/base/io_buffer.h"
#include "net/dns/dns_protocol.h"
@@ -33,7 +33,8 @@
header->qdcount = base::HostToNet16(1);
// Write question section after the header.
- BigEndianWriter writer(reinterpret_cast<char*>(header + 1), question_size);
+ base::BigEndianWriter writer(reinterpret_cast<char*>(header + 1),
+ question_size);
writer.WriteBytes(qname.data(), qname.size());
writer.WriteU16(qtype);
writer.WriteU16(dns_protocol::kClassIN);
@@ -59,9 +60,8 @@
uint16 DnsQuery::qtype() const {
uint16 type;
- ReadBigEndian<uint16>(io_buffer_->data() +
- sizeof(dns_protocol::Header) +
- qname_size_, &type);
+ base::ReadBigEndian<uint16>(
+ io_buffer_->data() + sizeof(dns_protocol::Header) + qname_size_, &type);
return type;
}
diff --git a/net/dns/dns_response.cc b/net/dns/dns_response.cc
index d29d3c48..64db818b 100644
--- a/net/dns/dns_response.cc
+++ b/net/dns/dns_response.cc
@@ -4,10 +4,10 @@
#include "net/dns/dns_response.h"
+#include "base/big_endian.h"
#include "base/strings/string_util.h"
#include "base/sys_byteorder.h"
#include "net/base/address_list.h"
-#include "net/base/big_endian.h"
#include "net/base/dns_util.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -73,7 +73,7 @@
if (seen > length_)
return 0;
uint16 offset;
- ReadBigEndian<uint16>(p, &offset);
+ base::ReadBigEndian<uint16>(p, &offset);
offset &= dns_protocol::kOffsetMask;
p = packet_ + offset;
if (p >= end)
@@ -113,8 +113,8 @@
size_t consumed = ReadName(cur_, &out->name);
if (!consumed)
return false;
- BigEndianReader reader(cur_ + consumed,
- packet_ + length_ - (cur_ + consumed));
+ base::BigEndianReader reader(cur_ + consumed,
+ packet_ + length_ - (cur_ + consumed));
uint16 rdlen;
if (reader.ReadU16(&out->type) &&
reader.ReadU16(&out->klass) &&
@@ -251,7 +251,7 @@
// QTYPE starts where QNAME ends.
const size_t type_offset = parser_.GetOffset() - 2 * sizeof(uint16);
uint16 type;
- ReadBigEndian<uint16>(io_buffer_->data() + type_offset, &type);
+ base::ReadBigEndian<uint16>(io_buffer_->data() + type_offset, &type);
return type;
}
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc
index 6301421..01acb34 100644
--- a/net/dns/dns_test_util.cc
+++ b/net/dns/dns_test_util.cc
@@ -6,11 +6,11 @@
#include <string>
+#include "base/big_endian.h"
#include "base/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/sys_byteorder.h"
-#include "net/base/big_endian.h"
#include "net/base/dns_util.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -119,7 +119,7 @@
// Write answer with loopback IP address.
header->ancount = base::HostToNet16(1);
- BigEndianWriter writer(buffer + nbytes, answer_size);
+ base::BigEndianWriter writer(buffer + nbytes, answer_size);
writer.WriteU16(kPointerToQueryName);
writer.WriteU16(qtype_);
writer.WriteU16(net::dns_protocol::kClassIN);
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
index 170ea678..130922c 100644
--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
@@ -8,6 +8,7 @@
#include <string>
#include <vector>
+#include "base/big_endian.h"
#include "base/bind.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -21,7 +22,6 @@
#include "base/threading/non_thread_safe.h"
#include "base/timer/timer.h"
#include "base/values.h"
-#include "net/base/big_endian.h"
#include "net/base/completion_callback.h"
#include "net/base/dns_util.h"
#include "net/base/io_buffer.h"
@@ -388,7 +388,8 @@
if (rv < 0)
return rv;
- WriteBigEndian<uint16>(length_buffer_->data(), query_->io_buffer()->size());
+ base::WriteBigEndian<uint16>(length_buffer_->data(),
+ query_->io_buffer()->size());
buffer_ =
new DrainableIOBuffer(length_buffer_.get(), length_buffer_->size());
next_state_ = STATE_SEND_LENGTH;
@@ -446,7 +447,7 @@
buffer_->BytesRemaining(),
base::Bind(&DnsTCPAttempt::OnIOComplete, base::Unretained(this)));
}
- ReadBigEndian<uint16>(length_buffer_->data(), &response_length_);
+ base::ReadBigEndian<uint16>(length_buffer_->data(), &response_length_);
// Check if advertised response is too short. (Optimization only.)
if (response_length_ < query_->io_buffer()->size())
return ERR_DNS_MALFORMED_RESPONSE;
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index 7040e44..67a0457 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -10,7 +10,6 @@
#include "base/rand_util.h"
#include "base/sys_byteorder.h"
#include "base/test/test_timeouts.h"
-#include "net/base/big_endian.h"
#include "net/base/dns_util.h"
#include "net/base/net_log.h"
#include "net/dns/dns_protocol.h"
diff --git a/net/dns/record_rdata.cc b/net/dns/record_rdata.cc
index 4ebc643..0c60559 100644
--- a/net/dns/record_rdata.cc
+++ b/net/dns/record_rdata.cc
@@ -4,7 +4,7 @@
#include "net/dns/record_rdata.h"
-#include "net/base/big_endian.h"
+#include "base/big_endian.h"
#include "net/base/dns_util.h"
#include "net/dns/dns_protocol.h"
#include "net/dns/dns_response.h"
@@ -29,7 +29,7 @@
scoped_ptr<SrvRecordRdata> rdata(new SrvRecordRdata);
- BigEndianReader reader(data.data(), data.size());
+ base::BigEndianReader reader(data.data(), data.size());
// 2 bytes for priority, 2 bytes for weight, 2 bytes for port.
reader.ReadU16(&rdata->priority_);
reader.ReadU16(&rdata->weight_);
diff --git a/net/dns/record_rdata.h b/net/dns/record_rdata.h
index f83a4865..def8e33 100644
--- a/net/dns/record_rdata.h
+++ b/net/dns/record_rdata.h
@@ -12,7 +12,6 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
-#include "net/base/big_endian.h"
#include "net/base/net_export.h"
#include "net/base/net_util.h"
#include "net/dns/dns_protocol.h"
