Generate Cronet Version.java based on VERSION and LASTCHANGE files.

components/cronet/android/url_request_peer.cc

 // Copyright 2014 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.
 
 #include "url_request_peer.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 
 namespace cronet {
 
 static const size_t kBufferSizeIncrement = 8192;
 
-// Fragment automatically inserted in the User-Agent header to indicate
-// that the request is coming from this network stack.
-static const char kUserAgentFragment[] = "; ChromiumJNI/";
-
 URLRequestPeer::URLRequestPeer(URLRequestContextPeer* context,
                                URLRequestPeerDelegate* delegate,
                                GURL url,
                                net::RequestPriority priority)
     : method_("GET"),
       url_request_(NULL),
       read_buffer_(new net::GrowableIOBuffer()),
       bytes_read_(0),
       total_bytes_read_(0),
       error_code_(0),
@@ skipping 78 matching lines @@
       url_, net::DEFAULT_PRIORITY, this, context_->GetURLRequestContext());
   url_request_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                              net::LOAD_DO_NOT_SAVE_COOKIES |
                              net::LOAD_DO_NOT_SEND_COOKIES);
   url_request_->set_method(method_);
   url_request_->SetExtraRequestHeaders(headers_);
   std::string user_agent;
   if (headers_.HasHeader(net::HttpRequestHeaders::kUserAgent)) {
     headers_.GetHeader(net::HttpRequestHeaders::kUserAgent, &user_agent);
   } else {
     user_agent = context_->GetUserAgent(url_);

[mmenke, 2014/06/20 17:41:16]

We never run this line, since we always pass in the user agent, right?

[mef, 2014/06/20 18:34:04]

Isn't it possible, that there is no User-Agent header yet?

[mmenke, 2014/06/20 19:03:59]

Ahh...you're right.  I was thinking we were adding it to the headers in
UrlRequest.java, not through the context (At some point, may want to switch - a
little more overhead to sending another string per request through Java, but
less code to do stuff here as well...Anyhow, not a huge difference)

   }
-  size_t pos = user_agent.find(')');
-  if (pos != std::string::npos) {
-    user_agent.insert(pos, context_->version());
-    user_agent.insert(pos, kUserAgentFragment);
-  }
   url_request_->SetExtraRequestHeaderByName(
       net::HttpRequestHeaders::kUserAgent, user_agent, true /* override */);

[mmenke, 2014/06/20 17:41:16]

I don't believe this does anything if
headers_.HasHeader(net::HttpRequestHeaders::kUserAgent) is true - we just
overwrite the old value with the same value.

[mef, 2014/06/20 18:34:04]

Done. It used to stick Cronet version into it, but that doesn't make sense now.
Done.

 
   VLOG(context_->logging_level()) << "User agent: " << user_agent;

[mmenke, 2014/06/20 17:41:16]

nit:  I don't think this is worth a VLOG, while we're here.

[mef, 2014/06/20 18:34:04]

Done. I guess it was there for debugging?

 
   if (upload_data_stream_) {
     url_request_->set_upload(make_scoped_ptr(upload_data_stream_.release()));
   } else if (streaming_upload_) {
     url_request_->EnableChunkedUpload();
   }
 
   url_request_->SetPriority(priority_);
 
   url_request_->Start();
@@ skipping 146 matching lines @@
 
   delegate_->OnBytesRead(this);
   delegate_->OnRequestFinished(this);
 }
 
 unsigned char* URLRequestPeer::Data() const {
   return reinterpret_cast<unsigned char*>(read_buffer_->StartOfBuffer());
 }
 
 }  // namespace cronet