| Index: net/proxy/proxy_config_service_android.cc
|
| diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
|
| index 80e3b929b454261cb0b6ab10e2e6b900f29be83f..503388aa439e7539a243d9af22c99a83c9b16ed3 100644
|
| --- a/net/proxy/proxy_config_service_android.cc
|
| +++ b/net/proxy/proxy_config_service_android.cc
|
| @@ -302,12 +302,12 @@ class ProxyConfigServiceAndroid::Delegate
|
| explicit JNIDelegateImpl(Delegate* delegate) : delegate_(delegate) {}
|
|
|
| // ProxyConfigServiceAndroid::JNIDelegate overrides.
|
| - virtual void ProxySettingsChangedTo(JNIEnv* env,
|
| - jobject jself,
|
| - jstring jhost,
|
| - jint jport,
|
| - jstring jpac_url,
|
| - jobjectArray jexclusion_list) override {
|
| + void ProxySettingsChangedTo(JNIEnv* env,
|
| + jobject jself,
|
| + jstring jhost,
|
| + jint jport,
|
| + jstring jpac_url,
|
| + jobjectArray jexclusion_list) override {
|
| std::string host = ConvertJavaStringToUTF8(env, jhost);
|
| std::string pac_url;
|
| if (jpac_url)
|
| @@ -318,7 +318,7 @@ class ProxyConfigServiceAndroid::Delegate
|
| delegate_->ProxySettingsChangedTo(host, jport, pac_url, exclusion_list);
|
| }
|
|
|
| - virtual void ProxySettingsChanged(JNIEnv* env, jobject self) override {
|
| + void ProxySettingsChanged(JNIEnv* env, jobject self) override {
|
| delegate_->ProxySettingsChanged();
|
| }
|
|
|
|
|