Upstream Android proxy config service.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 21d033e9c14da4c523e00bb4607dd5bf71804b84..2903904a725018f84e558e5a693389712fc70931 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -549,6 +549,8 @@
         'proxy/proxy_config.cc',
         'proxy/proxy_config.h',
         'proxy/proxy_config_service.h',
+        'proxy/proxy_config_service_android.cc',
+        'proxy/proxy_config_service_android.h',
         'proxy/proxy_config_service_fixed.cc',
         'proxy/proxy_config_service_fixed.h',
         'proxy/proxy_config_service_linux.cc',
@@ -1186,6 +1188,7 @@
         'proxy/proxy_server_unittest.cc',
         'proxy/proxy_service_unittest.cc',
         'proxy/sync_host_resolver_bridge_unittest.cc',
+        'proxy/proxy_config_service_android_unittest.cc',

[Ryan Sleevi, 2012/04/24 18:20:04]

nit: sort

[Philippe, 2012/05/09 11:48:39]

Done.

         'socket/buffered_write_stream_socket_unittest.cc',
         'socket/client_socket_pool_base_unittest.cc',
         'socket/deterministic_socket_data_unittest.cc',
@@ -1802,10 +1805,12 @@
             'java_sources': [
               'android/java/org/chromium/net/AndroidNetworkLibrary.java',
               'android/java/org/chromium/net/NetworkChangeNotifier.java',
+              'android/java/org/chromium/net/ProxyChangeListener.java',
             ],
             'jni_headers': [
               '<(SHARED_INTERMEDIATE_DIR)/net/jni/android_network_library_jni.h',
               '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h',
+              '<(SHARED_INTERMEDIATE_DIR)/net/jni/proxy_change_listener_jni.h',
             ],
           },
           'includes': [ '../build/jni_generator.gypi' ],