Upstream Android proxy config service.

net/android/net_jni_registrar.cc

Index: net/android/net_jni_registrar.cc
diff --git a/net/android/net_jni_registrar.cc b/net/android/net_jni_registrar.cc
index 951b1fb7f278100ac13dbdd59e19e612e0f4ef4a..b475cac391ff715368291d275abbdc906bbdf180 100644
--- a/net/android/net_jni_registrar.cc
+++ b/net/android/net_jni_registrar.cc
@@ -7,8 +7,9 @@
 #include "base/basictypes.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "net/android/network_library.h"
 #include "net/android/network_change_notifier_android.h"
+#include "net/android/network_library.h"
+#include "net/proxy/proxy_config_service_android.h"
 
 namespace net {
 namespace android {
@@ -16,6 +17,7 @@ namespace android {
 static base::android::RegistrationMethod kNetRegisteredMethods[] = {
   { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary },
   { "NetworkChangeNotifier", net::android::NetworkChangeNotifier::Register },
+  { "ProxyConfigService",  net::ProxyConfigServiceAndroid::Register },
 };
 
 bool RegisterJni(JNIEnv* env) {