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 74 matching lines @@
   VLOG(context_->logging_level())
       << "Starting chromium request: " << url_.possibly_invalid_spec().c_str()
       << " priority: " << RequestPriorityToString(priority_);
   url_request_ = new net::URLRequest(
       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 {
+  if (!headers_.HasHeader(net::HttpRequestHeaders::kUserAgent)) {
+    std::string user_agent;
     user_agent = context_->GetUserAgent(url_);
+    url_request_->SetExtraRequestHeaderByName(
+      net::HttpRequestHeaders::kUserAgent, user_agent, true /* override */);
   }
-  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 */);
-
-  VLOG(context_->logging_level()) << "User agent: " << user_agent;
 
   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