| Index: net/proxy/proxy_config_service_android.h
|
| diff --git a/net/proxy/proxy_config_service_android.h b/net/proxy/proxy_config_service_android.h
|
| index 400864eeb13cd3108d913c86b0ea36279bb2a42f..f2a54c5949a6b21e867ae593f43387f2fdbcd7fc 100644
|
| --- a/net/proxy/proxy_config_service_android.h
|
| +++ b/net/proxy/proxy_config_service_android.h
|
| @@ -28,7 +28,7 @@ class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService {
|
| // Callback that returns the value of the property identified by the provided
|
| // key. If it was not found, an empty string is returned. Note that this
|
| // interface does not let you distinguish an empty property from a
|
| - // non-existing property. This callback is invoked on the JNI thread.
|
| + // non-existing property. This callback is invoked on the network thread.
|
| typedef base::Callback<std::string (const std::string& property)>
|
| GetPropertyCallback;
|
|
|
| @@ -38,13 +38,13 @@ class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService {
|
| public:
|
| virtual ~JNIDelegate() {}
|
|
|
| - // Called from Java (on JNI thread) to signal that the proxy settings have
|
| - // changed.
|
| + // Called from Java (on glib thread) to signal that the proxy settings
|
| + // have changed.
|
| virtual void ProxySettingsChanged(JNIEnv*, jobject) = 0;
|
| };
|
|
|
| ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner,
|
| - base::SequencedTaskRunner* jni_task_runner);
|
| + base::SequencedTaskRunner* glib_task_runner);
|
|
|
| virtual ~ProxyConfigServiceAndroid();
|
|
|
| @@ -56,6 +56,8 @@ class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService {
|
| virtual void AddObserver(Observer* observer) OVERRIDE;
|
| virtual void RemoveObserver(Observer* observer) OVERRIDE;
|
| virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE;
|
| + // Called from glib thread.
|
| + virtual void StartTearDown() OVERRIDE;
|
|
|
| private:
|
| friend class ProxyConfigServiceAndroidTestBase;
|
| @@ -64,7 +66,7 @@ class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService {
|
|
|
| // For tests.
|
| ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner,
|
| - base::SequencedTaskRunner* jni_task_runner,
|
| + base::SequencedTaskRunner* glib_task_runner,
|
| GetPropertyCallback get_property_callback);
|
|
|
| // For tests.
|
|
|