SPDY - integration of spdy/3 code.

net/spdy/spdy_bitmasks.h

Index: net/spdy/spdy_bitmasks.h
===================================================================
--- net/spdy/spdy_bitmasks.h	(revision 126086)
+++ net/spdy/spdy_bitmasks.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -15,14 +15,12 @@
 const unsigned int kControlFlagMask = 0x8000;
 
 // Priority mask from the SYN_FRAME
-const unsigned int kPriorityMask = 0xc0;
+const unsigned int kSpdy3PriorityMask = 0xe0;
+const unsigned int kSpdy2PriorityMask = 0xc0;
 
 // Mask the lower 24 bits.
 const unsigned int kLengthMask = 0xffffff;
 
-// Mask the Id from a SETTINGS id.
-const unsigned int kSettingsIdMask = 0xffffff;
-
 // Legal flags on data packets.
 const int kDataFlagsMask = 0x03;