Skip to content

Commit

Permalink
Remove unused GetUrlFromHeaderBlock() argument.
Browse files Browse the repository at this point in the history
Review URL: https://codereview.chromium.org/1581413003

Cr-Commit-Position: refs/heads/master@{#370253}
  • Loading branch information
bnc authored and Commit bot committed Jan 20, 2016
1 parent bc8f4fc commit 561b5c1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
4 changes: 1 addition & 3 deletions net/spdy/spdy_http_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,7 @@ NET_EXPORT_PRIVATE RequestPriority ConvertSpdyPriorityToRequestPriority(
}

GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
SpdyMajorVersion protocol_version,
bool pushed) {
DCHECK_LE(SPDY3, protocol_version);
SpdyMajorVersion protocol_version) {
SpdyHeaderBlock::const_iterator it = headers.find(":scheme");
if (it == headers.end())
return GURL();
Expand Down
3 changes: 1 addition & 2 deletions net/spdy/spdy_http_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ NET_EXPORT void CreateSpdyHeadersFromHttpResponse(
// Returns the URL associated with the |headers| by assembling the
// scheme, host and path from the protocol specific keys.
NET_EXPORT GURL GetUrlFromHeaderBlock(const SpdyHeaderBlock& headers,
SpdyMajorVersion protocol_version,
bool pushed);
SpdyMajorVersion protocol_version);

NET_EXPORT SpdyPriority ConvertRequestPriorityToSpdyPriority(
RequestPriority priority,
Expand Down
2 changes: 1 addition & 1 deletion net/spdy/spdy_session.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2711,7 +2711,7 @@ bool SpdySession::TryCreatePushStream(SpdyStreamId stream_id,
// TODO(mbelshe): DCHECK that this is a GET method?

// Verify that the response had a URL for us.
GURL gurl = GetUrlFromHeaderBlock(headers, GetProtocolVersion(), true);
GURL gurl = GetUrlFromHeaderBlock(headers, GetProtocolVersion());
if (!gurl.is_valid()) {
EnqueueResetStreamFrame(stream_id,
request_priority,
Expand Down
2 changes: 1 addition & 1 deletion net/spdy/spdy_session_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4679,7 +4679,7 @@ TEST_P(SpdySessionTest, SplitHeaders) {
EXPECT_EQ("beta", alpha_val);

GURL request_url =
GetUrlFromHeaderBlock(request_headers, spdy_util_.spdy_version(), true);
GetUrlFromHeaderBlock(request_headers, spdy_util_.spdy_version());
EXPECT_EQ(kStreamUrl, request_url);
}

Expand Down
3 changes: 1 addition & 2 deletions net/spdy/spdy_stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -796,8 +796,7 @@ GURL SpdyStream::GetUrlFromHeaders() const {
if (!request_headers_)
return GURL();

return GetUrlFromHeaderBlock(
*request_headers_, GetProtocolVersion(), type_ == SPDY_PUSH_STREAM);
return GetUrlFromHeaderBlock(*request_headers_, GetProtocolVersion());
}

bool SpdyStream::HasUrlFromHeaders() const {
Expand Down

0 comments on commit 561b5c1

Please sign in to comment.