[Cronet] Expose quic_user_agent_id and quic_prefer_aes config options.

components/cronet/android/api/src/org/chromium/net/UserAgent.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.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ skipping 11 matching lines @@
 public final class UserAgent {
     private static final Object sLock = new Object();
 
     private static final int VERSION_CODE_UNINITIALIZED = 0;
     private static int sVersionCode = VERSION_CODE_UNINITIALIZED;
 
     private UserAgent() {
     }
 
     /**
-     * Constructs a User-Agent string including Cronet version, and application
-     * name and version.
+     * Constructs a User-Agent string including application name and version,
+     * system build version, model and Id, and Cronet version.
      * @param context the context to fetch the application name and version
      *         from.
      * @return User-Agent string.
      */
     public static String from(Context context) {
         StringBuilder builder = new StringBuilder();
 
         // Our package name and version.
         builder.append(context.getPackageName());
         builder.append('/');
@@ skipping 18 matching lines @@
         }
 
         builder.append("; Cronet/");
         builder.append(Version.CRONET_VERSION);
 
         builder.append(')');
 
         return builder.toString();
     }
 
+    /**
+     * Constructs default QUIC User Agent Id string including application name
+     * and Cronet version.
+     * @param context the context to fetch the application name from.
+     * @return User-Agent string.
+     */
+    static String getQuicUserAgentIdFrom(Context context) {
+        StringBuilder builder = new StringBuilder();
+
+        // Application name and cronet version.
+        builder.append(context.getPackageName());
+        builder.append(" Cronet/");
+        builder.append(Version.CRONET_VERSION);
+
+        return builder.toString();
+    }
+
     private static int versionFromContext(Context context) {
         synchronized (sLock) {
             if (sVersionCode == VERSION_CODE_UNINITIALIZED) {
                 PackageManager packageManager = context.getPackageManager();
                 String packageName = context.getPackageName();
                 try {
                     PackageInfo packageInfo = packageManager.getPackageInfo(
                             packageName, 0);
                     sVersionCode = packageInfo.versionCode;
                 } catch (NameNotFoundException e) {
                     throw new IllegalStateException(
                             "Cannot determine package version");
                 }
             }
             return sVersionCode;
         }
     }
 }