net: Give more descriptive names for code around the request merging logic.

This is a follow-up patch based on wtc's comments on the earlier patch:
http://codereview.chromium.org/9270030/

BUG=72001
TEST=no logic change


Review URL: http://codereview.chromium.org/9284033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118942 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc
index 7966889..be1c828 100644
--- a/net/http/http_stream_parser.cc
+++ b/net/http/http_stream_parser.cc
@@ -139,7 +139,7 @@ int HttpStreamParser::SendRequest(const std::string& request_line,
   // If we have a small request body, then we'll merge with the headers into a
   // single write.
   bool did_merge = false;
-  if (ShouldMerge(request, request_body_.get())) {
+  if (ShouldMergeRequestHeadersAndBody(request, request_body_.get())) {
     size_t merged_size = request.size() + request_body->size();
     scoped_refptr<IOBuffer> merged_request_headers_and_body(
         new IOBuffer(merged_size));
@@ -811,13 +811,14 @@ int HttpStreamParser::EncodeChunk(const base::StringPiece& payload,
 }
 
 // static
-bool HttpStreamParser::ShouldMerge(const std::string& request,
-                                   const UploadDataStream* request_body) {
+bool HttpStreamParser::ShouldMergeRequestHeadersAndBody(
+    const std::string& request_headers,
+    const UploadDataStream* request_body) {
   if (request_body != NULL &&
       // IsInMemory() ensures that the request body is not chunked.
       request_body->IsInMemory() &&
       request_body->size() > 0) {
-    size_t merged_size = request.size() + request_body->size();
+    size_t merged_size = request_headers.size() + request_body->size();
     if (merged_size <= kMaxMergedHeaderAndBodySize)
       return true;
   }