| 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 d27bc5ac548df2cbb9aafb9232fe3134bdbe4855..b294689f078ca47b08cf99dea3bae10e21fee0d0 100644
|
| --- a/net/proxy/proxy_config_service_android.cc
|
| +++ b/net/proxy/proxy_config_service_android.cc
|
| @@ -277,7 +277,7 @@ class ProxyConfigServiceAndroid::Delegate
|
| jobject jself,
|
| jstring jhost,
|
| jint jport,
|
| - jstring jpac_url) OVERRIDE {
|
| + jstring jpac_url) override {
|
| std::string host = ConvertJavaStringToUTF8(env, jhost);
|
| std::string pac_url;
|
| if (jpac_url)
|
| @@ -285,7 +285,7 @@ class ProxyConfigServiceAndroid::Delegate
|
| delegate_->ProxySettingsChangedTo(host, jport, pac_url);
|
| }
|
|
|
| - virtual void ProxySettingsChanged(JNIEnv* env, jobject self) OVERRIDE {
|
| + virtual void ProxySettingsChanged(JNIEnv* env, jobject self) override {
|
| delegate_->ProxySettingsChanged();
|
| }
|
|
|
|
|