Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side Diff: net/spdy/spdy_framer_test.cc

Issue 347063008: SpdyFramerTests: Remove redundant .get() calls on unique_ptrs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 #include <iostream> 6 #include <iostream>
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 } 917 }
918 scoped_ptr<SpdyFrame> frame2(framer.SerializeSynStream(syn_stream)); 918 scoped_ptr<SpdyFrame> frame2(framer.SerializeSynStream(syn_stream));
919 size_t uncompressed_size2 = visitor->last_payload_len_; 919 size_t uncompressed_size2 = visitor->last_payload_len_;
920 size_t compressed_size2 = 920 size_t compressed_size2 =
921 visitor->last_frame_len_ - framer.GetSynStreamMinimumSize(); 921 visitor->last_frame_len_ - framer.GetSynStreamMinimumSize();
922 922
923 // Expect the second frame to be more compact than the first. 923 // Expect the second frame to be more compact than the first.
924 EXPECT_LE(frame2->size(), frame1->size()); 924 EXPECT_LE(frame2->size(), frame1->size());
925 925
926 // Decompress the first frame 926 // Decompress the first frame
927 scoped_ptr<SpdyFrame> frame3(SpdyFramerTestUtil::DecompressFrame( 927 scoped_ptr<SpdyFrame> frame3(
928 &framer, *frame1.get())); 928 SpdyFramerTestUtil::DecompressFrame(&framer, *frame1));
929 929
930 // Decompress the second frame 930 // Decompress the second frame
931 visitor.reset(new TestSpdyVisitor(spdy_version_)); 931 visitor.reset(new TestSpdyVisitor(spdy_version_));
932 framer.set_debug_visitor(visitor.get()); 932 framer.set_debug_visitor(visitor.get());
933 scoped_ptr<SpdyFrame> frame4(SpdyFramerTestUtil::DecompressFrame( 933 scoped_ptr<SpdyFrame> frame4(
934 &framer, *frame2.get())); 934 SpdyFramerTestUtil::DecompressFrame(&framer, *frame2));
935 size_t uncompressed_size4 = 935 size_t uncompressed_size4 =
936 frame4->size() - framer.GetSynStreamMinimumSize(); 936 frame4->size() - framer.GetSynStreamMinimumSize();
937 size_t compressed_size4 = 937 size_t compressed_size4 =
938 visitor->last_frame_len_ - framer.GetSynStreamMinimumSize(); 938 visitor->last_frame_len_ - framer.GetSynStreamMinimumSize();
939 if (IsSpdy2()) { 939 if (IsSpdy2()) {
940 EXPECT_EQ(139u, uncompressed_size4); 940 EXPECT_EQ(139u, uncompressed_size4);
941 #if defined(USE_SYSTEM_ZLIB) 941 #if defined(USE_SYSTEM_ZLIB)
942 EXPECT_EQ(149u, compressed_size4); 942 EXPECT_EQ(149u, compressed_size4);
943 #else // !defined(USE_SYSTEM_ZLIB) 943 #else // !defined(USE_SYSTEM_ZLIB)
944 EXPECT_EQ(101u, compressed_size4); 944 EXPECT_EQ(101u, compressed_size4);
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 scoped_ptr<SpdyFrame> syn_frame_2(send_framer.SerializeSynStream(syn_stream)); 1389 scoped_ptr<SpdyFrame> syn_frame_2(send_framer.SerializeSynStream(syn_stream));
1390 EXPECT_TRUE(syn_frame_2.get() != NULL); 1390 EXPECT_TRUE(syn_frame_2.get() != NULL);
1391 1391
1392 // Now start decompressing 1392 // Now start decompressing
1393 scoped_ptr<SpdyFrame> decompressed; 1393 scoped_ptr<SpdyFrame> decompressed;
1394 scoped_ptr<SpdyFrame> uncompressed; 1394 scoped_ptr<SpdyFrame> uncompressed;
1395 base::StringPiece serialized_headers; 1395 base::StringPiece serialized_headers;
1396 SpdyHeaderBlock decompressed_headers; 1396 SpdyHeaderBlock decompressed_headers;
1397 1397
1398 // Decompress SYN_STREAM #1 1398 // Decompress SYN_STREAM #1
1399 decompressed.reset(SpdyFramerTestUtil::DecompressFrame( 1399 decompressed.reset(
1400 &recv_framer, *syn_frame_1.get())); 1400 SpdyFramerTestUtil::DecompressFrame(&recv_framer, *syn_frame_1));
1401 EXPECT_TRUE(decompressed.get() != NULL); 1401 EXPECT_TRUE(decompressed.get() != NULL);
1402 serialized_headers = GetSerializedHeaders(decompressed.get(), send_framer); 1402 serialized_headers = GetSerializedHeaders(decompressed.get(), send_framer);
1403 EXPECT_TRUE(recv_framer.ParseHeaderBlockInBuffer(serialized_headers.data(), 1403 EXPECT_TRUE(recv_framer.ParseHeaderBlockInBuffer(serialized_headers.data(),
1404 serialized_headers.size(), 1404 serialized_headers.size(),
1405 &decompressed_headers)); 1405 &decompressed_headers));
1406 EXPECT_EQ(2u, decompressed_headers.size()); 1406 EXPECT_EQ(2u, decompressed_headers.size());
1407 EXPECT_EQ(kValue1, decompressed_headers[kHeader1]); 1407 EXPECT_EQ(kValue1, decompressed_headers[kHeader1]);
1408 EXPECT_EQ(kValue2, decompressed_headers[kHeader2]); 1408 EXPECT_EQ(kValue2, decompressed_headers[kHeader2]);
1409 1409
1410 // Decompress SYN_STREAM #2 1410 // Decompress SYN_STREAM #2
1411 decompressed.reset(SpdyFramerTestUtil::DecompressFrame( 1411 decompressed.reset(
1412 &recv_framer, *syn_frame_2.get())); 1412 SpdyFramerTestUtil::DecompressFrame(&recv_framer, *syn_frame_2));
1413 EXPECT_TRUE(decompressed.get() != NULL); 1413 EXPECT_TRUE(decompressed.get() != NULL);
1414 serialized_headers = GetSerializedHeaders(decompressed.get(), send_framer); 1414 serialized_headers = GetSerializedHeaders(decompressed.get(), send_framer);
1415 decompressed_headers.clear(); 1415 decompressed_headers.clear();
1416 EXPECT_TRUE(recv_framer.ParseHeaderBlockInBuffer(serialized_headers.data(), 1416 EXPECT_TRUE(recv_framer.ParseHeaderBlockInBuffer(serialized_headers.data(),
1417 serialized_headers.size(), 1417 serialized_headers.size(),
1418 &decompressed_headers)); 1418 &decompressed_headers));
1419 EXPECT_EQ(3u, decompressed_headers.size()); 1419 EXPECT_EQ(3u, decompressed_headers.size());
1420 EXPECT_EQ(kValue1, decompressed_headers[kHeader1]); 1420 EXPECT_EQ(kValue1, decompressed_headers[kHeader1]);
1421 EXPECT_EQ(kValue2, decompressed_headers[kHeader2]); 1421 EXPECT_EQ(kValue2, decompressed_headers[kHeader2]);
1422 EXPECT_EQ(kValue3, decompressed_headers[kHeader3]); 1422 EXPECT_EQ(kValue3, decompressed_headers[kHeader3]);
(...skipping 4012 matching lines...) Expand 10 before | Expand all | Expand 10 after
5435 EXPECT_EQ(4u, framer.MapWeightToPriority(109)); 5435 EXPECT_EQ(4u, framer.MapWeightToPriority(109));
5436 EXPECT_EQ(4u, framer.MapWeightToPriority(74)); 5436 EXPECT_EQ(4u, framer.MapWeightToPriority(74));
5437 EXPECT_EQ(5u, framer.MapWeightToPriority(73)); 5437 EXPECT_EQ(5u, framer.MapWeightToPriority(73));
5438 EXPECT_EQ(5u, framer.MapWeightToPriority(37)); 5438 EXPECT_EQ(5u, framer.MapWeightToPriority(37));
5439 EXPECT_EQ(6u, framer.MapWeightToPriority(36)); 5439 EXPECT_EQ(6u, framer.MapWeightToPriority(36));
5440 EXPECT_EQ(6u, framer.MapWeightToPriority(1)); 5440 EXPECT_EQ(6u, framer.MapWeightToPriority(1));
5441 EXPECT_EQ(7u, framer.MapWeightToPriority(0)); 5441 EXPECT_EQ(7u, framer.MapWeightToPriority(0));
5442 } 5442 }
5443 5443
5444 } // namespace net 5444 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698