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

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

Issue 987823003: Code cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « net/spdy/spdy_framer.cc ('k') | 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 2496 matching lines...) Expand 10 before | Expand all | Expand 10 after
2507 0x00, 0x00, 0x00, 0x00, 2507 0x00, 0x00, 0x00, 0x00,
2508 0x00, 0x00, 0x04, 0x0a, 2508 0x00, 0x00, 0x04, 0x0a,
2509 0x0b, 0x0c, 0x0d, 2509 0x0b, 0x0c, 0x0d,
2510 }; 2510 };
2511 2511
2512 uint32 kValue = 0x0a0b0c0d; 2512 uint32 kValue = 0x0a0b0c0d;
2513 SpdySettingsIR settings_ir; 2513 SpdySettingsIR settings_ir;
2514 2514
2515 SpdySettingsFlags kFlags = static_cast<SpdySettingsFlags>(0x01); 2515 SpdySettingsFlags kFlags = static_cast<SpdySettingsFlags>(0x01);
2516 SpdySettingsIds kId = SETTINGS_INITIAL_WINDOW_SIZE; 2516 SpdySettingsIds kId = SETTINGS_INITIAL_WINDOW_SIZE;
2517 SettingsMap settings;
2518 settings[kId] = SettingsFlagsAndValue(kFlags, kValue);
2519 EXPECT_EQ(kFlags, settings[kId].first);
2520 EXPECT_EQ(kValue, settings[kId].second);
2521 settings_ir.AddSetting(kId, 2517 settings_ir.AddSetting(kId,
2522 kFlags & SETTINGS_FLAG_PLEASE_PERSIST, 2518 kFlags & SETTINGS_FLAG_PLEASE_PERSIST,
2523 kFlags & SETTINGS_FLAG_PERSISTED, 2519 kFlags & SETTINGS_FLAG_PERSISTED,
2524 kValue); 2520 kValue);
2525 2521
2526 scoped_ptr<SpdyFrame> frame(framer.SerializeSettings(settings_ir)); 2522 scoped_ptr<SpdyFrame> frame(framer.SerializeSettings(settings_ir));
2527 if (IsSpdy2()) { 2523 if (IsSpdy2()) {
2528 CompareFrame(kDescription, *frame, kV2FrameData, arraysize(kV2FrameData)); 2524 CompareFrame(kDescription, *frame, kV2FrameData, arraysize(kV2FrameData));
2529 } else if (IsSpdy3()) { 2525 } else if (IsSpdy3()) {
2530 CompareFrame(kDescription, *frame, kV3FrameData, arraysize(kV3FrameData)); 2526 CompareFrame(kDescription, *frame, kV3FrameData, arraysize(kV3FrameData));
(...skipping 3404 matching lines...) Expand 10 before | Expand all | Expand 10 after
5935 TestSpdyVisitor visitor(spdy_version_); 5931 TestSpdyVisitor visitor(spdy_version_);
5936 visitor.SimulateInFramer(kFrameData, sizeof(kFrameData)); 5932 visitor.SimulateInFramer(kFrameData, sizeof(kFrameData));
5937 5933
5938 EXPECT_EQ(SpdyFramer::SPDY_ERROR, visitor.framer_.state()); 5934 EXPECT_EQ(SpdyFramer::SPDY_ERROR, visitor.framer_.state());
5939 EXPECT_EQ(SpdyFramer::SPDY_INVALID_CONTROL_FRAME, 5935 EXPECT_EQ(SpdyFramer::SPDY_INVALID_CONTROL_FRAME,
5940 visitor.framer_.error_code()) 5936 visitor.framer_.error_code())
5941 << SpdyFramer::ErrorCodeToString(visitor.framer_.error_code()); 5937 << SpdyFramer::ErrorCodeToString(visitor.framer_.error_code());
5942 } 5938 }
5943 5939
5944 } // namespace net 5940 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_framer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698