[Cronet] Respect user agent string from config

components/cronet/android/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java

 // 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.
 
 package org.chromium.net;
 
 import android.content.Context;
 import android.text.TextUtils;
 
 import org.apache.http.HttpStatus;
@@ skipping 23 matching lines @@
 class HttpUrlConnectionUrlRequest implements HttpUrlRequest {
 
     private static final int MAX_CHUNK_SIZE = 8192;
 
     private static final int CONNECT_TIMEOUT = 3000;
 
     private static final int READ_TIMEOUT = 90000;
 
     private final Context mContext;
 
+    private final String mDefaultUserAgent;
+
     private final String mUrl;
 
     private final Map<String, String> mHeaders;
 
     private final WritableByteChannel mSink;
 
     private final HttpUrlRequestListener mListener;
 
     private IOException mException;
 
@@ skipping 34 matching lines @@
     private String mMethod;
 
     private InputStream mResponseStream;
 
     private final Object mLock;
 
     private static ExecutorService sExecutorService;
 
     private static final Object sExecutorServiceLock = new Object();
 
-    HttpUrlConnectionUrlRequest(Context context, String url,
-            int requestPriority, Map<String, String> headers,
+    HttpUrlConnectionUrlRequest(Context context, String defaultUserAgent,
+            String url, int requestPriority, Map<String, String> headers,
             HttpUrlRequestListener listener) {
-        this(context, url, requestPriority, headers,
+        this(context, defaultUserAgent, url, requestPriority, headers,
                 new ChunkedWritableByteChannel(), listener);
     }
 
-    HttpUrlConnectionUrlRequest(Context context, String url,
-            int requestPriority, Map<String, String> headers,
+    HttpUrlConnectionUrlRequest(Context context, String defaultUserAgent,
+            String url, int requestPriority, Map<String, String> headers,
             WritableByteChannel sink, HttpUrlRequestListener listener) {
         if (context == null) {
             throw new NullPointerException("Context is required");
         }
         if (url == null) {
             throw new NullPointerException("URL is required");
         }
         mContext = context;
+        mDefaultUserAgent = defaultUserAgent;
         mUrl = url;
         mHeaders = headers;
         mSink = sink;
         mListener = listener;
         mLock = new Object();
     }
 
     private static ExecutorService getExecutor() {
         synchronized (sExecutorServiceLock) {
             if (sExecutorService == null) {
@@ skipping 108 matching lines @@
                             header.getValue());
                 }
             }
 
             if (mOffset != 0) {
                 mConnection.setRequestProperty("Range",
                         "bytes=" + mOffset + "-");
             }
 
             if (mConnection.getRequestProperty("User-Agent") == null) {
-                mConnection.setRequestProperty("User-Agent",
-                        UserAgent.from(mContext));
+                mConnection.setRequestProperty("User-Agent", mDefaultUserAgent);
             }
 
             if (mPostData != null || mPostDataChannel != null) {
                 uploadData();
             }
 
             InputStream stream = null;
             try {
                 // We need to open the stream before asking for the response
                 // code.
@@ skipping 258 matching lines @@
         }
         return mConnection.getHeaderFields();
     }
 
     private void validateNotStarted() {
         if (mStarted) {
             throw new IllegalStateException("Request already started");
         }
     }
 }