| Index: net/spdy/hpack_huffman_aggregator.cc
|
| diff --git a/net/spdy/hpack_huffman_aggregator.cc b/net/spdy/hpack_huffman_aggregator.cc
|
| index 507f87258299bd5635adf9b71f6f9dd79e8ef64d..6cf191448b315ab36d1b890b98ca128143667690 100644
|
| --- a/net/spdy/hpack_huffman_aggregator.cc
|
| +++ b/net/spdy/hpack_huffman_aggregator.cc
|
| @@ -31,9 +31,7 @@ const size_t kMaxEncoders = 20;
|
| } // namespace
|
|
|
| HpackHuffmanAggregator::HpackHuffmanAggregator()
|
| - : counts_(256, 0),
|
| - total_counts_(0),
|
| - max_encoders_(kMaxEncoders) {
|
| + : counts_(256, 0), total_counts_(0), max_encoders_(kMaxEncoders) {
|
| }
|
|
|
| HpackHuffmanAggregator::~HpackHuffmanAggregator() {
|
| @@ -51,8 +49,8 @@ void HpackHuffmanAggregator::AggregateTransactionCharacterCounts(
|
| }
|
| HostPortPair endpoint = HostPortPair(request.url.HostNoBrackets(),
|
| request.url.EffectiveIntPort());
|
| - HpackEncoder* encoder = ObtainEncoder(
|
| - SpdySessionKey(endpoint, proxy, request.privacy_mode));
|
| + HpackEncoder* encoder =
|
| + ObtainEncoder(SpdySessionKey(endpoint, proxy, request.privacy_mode));
|
|
|
| // Convert and encode the request and response header sets.
|
| {
|
| @@ -118,8 +116,8 @@ bool HpackHuffmanAggregator::IsCrossOrigin(const HttpRequestInfo& request) {
|
| return true;
|
| }
|
| GURL referer(referer_str);
|
| - HostPortPair referer_endpoint = HostPortPair(referer.HostNoBrackets(),
|
| - referer.EffectiveIntPort());
|
| + HostPortPair referer_endpoint =
|
| + HostPortPair(referer.HostNoBrackets(), referer.EffectiveIntPort());
|
| if (!endpoint.Equals(referer_endpoint)) {
|
| // Cross-origin request.
|
| return true;
|
| @@ -129,8 +127,8 @@ bool HpackHuffmanAggregator::IsCrossOrigin(const HttpRequestInfo& request) {
|
| }
|
|
|
| HpackEncoder* HpackHuffmanAggregator::ObtainEncoder(const SpdySessionKey& key) {
|
| - for (OriginEncoders::iterator it = encoders_.begin();
|
| - it != encoders_.end(); ++it) {
|
| + for (OriginEncoders::iterator it = encoders_.begin(); it != encoders_.end();
|
| + ++it) {
|
| if (key.Equals(it->first)) {
|
| // Move to head of list and return.
|
| OriginEncoder origin_encoder = *it;
|
| @@ -140,8 +138,8 @@ HpackEncoder* HpackHuffmanAggregator::ObtainEncoder(const SpdySessionKey& key) {
|
| }
|
| }
|
| // Not found. Create a new encoder, evicting one if needed.
|
| - encoders_.push_front(std::make_pair(
|
| - key, new HpackEncoder(ObtainHpackHuffmanTable())));
|
| + encoders_.push_front(
|
| + std::make_pair(key, new HpackEncoder(ObtainHpackHuffmanTable())));
|
| if (encoders_.size() > max_encoders_) {
|
| delete encoders_.back().second;
|
| encoders_.pop_back();
|
| @@ -172,7 +170,10 @@ void HpackHuffmanAggregator::PublishCounts() {
|
| kHistogramName,
|
| AddSamples(samples),
|
| base::LinearHistogram::FactoryGet(
|
| - kHistogramName, kRangeMin, kRangeMax, kBucketCount,
|
| + kHistogramName,
|
| + kRangeMin,
|
| + kRangeMax,
|
| + kBucketCount,
|
| base::HistogramBase::kUmaTargetedHistogramFlag));
|
|
|
| // Clear counts.
|
|
|