Index: net/spdy/spdy_framer.h |
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h |
index 97e6278da8de188b07826302da3dc02dfcb4882a..73eaf8b671b83fe01d06e816ff8cef6d3fffe2f6 100644 |
--- a/net/spdy/spdy_framer.h |
+++ b/net/spdy/spdy_framer.h |
@@ -56,7 +56,7 @@ typedef std::map<std::string, std::string> SpdyHeaderBlock; |
// Conveniently handles converstion to/from wire format. |
class NET_EXPORT_PRIVATE SettingsFlagsAndId { |
public: |
- static SettingsFlagsAndId FromWireFormat(net::SpdyMajorVersion version, |
+ static SettingsFlagsAndId FromWireFormat(SpdyMajorVersion version, |
uint32 wire); |
SettingsFlagsAndId() : flags_(0), id_(0) {} |
@@ -64,7 +64,7 @@ class NET_EXPORT_PRIVATE SettingsFlagsAndId { |
// TODO(hkhalil): restrict to enums instead of free-form ints. |
SettingsFlagsAndId(uint8 flags, uint32 id); |
- uint32 GetWireFormat(net::SpdyMajorVersion version) const; |
+ uint32 GetWireFormat(SpdyMajorVersion version) const; |
uint32 id() const { return id_; } |
uint8 flags() const { return flags_; } |
@@ -321,13 +321,13 @@ class NET_EXPORT_PRIVATE SpdyFramer { |
// Serializes a SpdyHeaderBlock. |
static void WriteHeaderBlock(SpdyFrameBuilder* frame, |
- const net::SpdyMajorVersion spdy_version, |
+ const SpdyMajorVersion spdy_version, |
const SpdyHeaderBlock* headers); |
// Retrieve serialized length of SpdyHeaderBlock. |
// TODO(hkhalil): Remove, or move to quic code. |
static size_t GetSerializedLength( |
- const net::SpdyMajorVersion spdy_version, |
+ const SpdyMajorVersion spdy_version, |
const SpdyHeaderBlock* headers); |
// Create a new Framer, provided a SPDY version. |