| Index: net/proxy/proxy_service.cc
|
| diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
|
| index 47a4dc2434c60b2a3d91b220194c5f46d93f4a69..52e9f7f1efc9141cef623a9fe1200fb08974ba65 100644
|
| --- a/net/proxy/proxy_service.cc
|
| +++ b/net/proxy/proxy_service.cc
|
| @@ -121,7 +121,7 @@ class DefaultPollPolicy : public ProxyService::PacPollPolicy {
|
|
|
| virtual Mode GetNextDelay(int initial_error,
|
| TimeDelta current_delay,
|
| - TimeDelta* next_delay) const OVERRIDE {
|
| + TimeDelta* next_delay) const override {
|
| if (initial_error != OK) {
|
| // Re-try policy for failures.
|
| const int kDelay1Seconds = 8;
|
| @@ -160,10 +160,10 @@ class DefaultPollPolicy : public ProxyService::PacPollPolicy {
|
| class ProxyConfigServiceDirect : public ProxyConfigService {
|
| public:
|
| // ProxyConfigService implementation:
|
| - virtual void AddObserver(Observer* observer) OVERRIDE {}
|
| - virtual void RemoveObserver(Observer* observer) OVERRIDE {}
|
| + virtual void AddObserver(Observer* observer) override {}
|
| + virtual void RemoveObserver(Observer* observer) override {}
|
| virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config)
|
| - OVERRIDE {
|
| + override {
|
| *config = ProxyConfig::CreateDirect();
|
| config->set_source(PROXY_CONFIG_SOURCE_UNKNOWN);
|
| return CONFIG_VALID;
|
| @@ -180,26 +180,26 @@ class ProxyResolverNull : public ProxyResolver {
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| RequestHandle* request,
|
| - const BoundNetLog& net_log) OVERRIDE {
|
| + const BoundNetLog& net_log) override {
|
| return ERR_NOT_IMPLEMENTED;
|
| }
|
|
|
| - virtual void CancelRequest(RequestHandle request) OVERRIDE {
|
| + virtual void CancelRequest(RequestHandle request) override {
|
| NOTREACHED();
|
| }
|
|
|
| - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE {
|
| + virtual LoadState GetLoadState(RequestHandle request) const override {
|
| NOTREACHED();
|
| return LOAD_STATE_IDLE;
|
| }
|
|
|
| - virtual void CancelSetPacScript() OVERRIDE {
|
| + virtual void CancelSetPacScript() override {
|
| NOTREACHED();
|
| }
|
|
|
| virtual int SetPacScript(
|
| const scoped_refptr<ProxyResolverScriptData>& /*script_data*/,
|
| - const CompletionCallback& /*callback*/) OVERRIDE {
|
| + const CompletionCallback& /*callback*/) override {
|
| return ERR_NOT_IMPLEMENTED;
|
| }
|
| };
|
| @@ -216,27 +216,27 @@ class ProxyResolverFromPacString : public ProxyResolver {
|
| ProxyInfo* results,
|
| const CompletionCallback& callback,
|
| RequestHandle* request,
|
| - const BoundNetLog& net_log) OVERRIDE {
|
| + const BoundNetLog& net_log) override {
|
| results->UsePacString(pac_string_);
|
| return OK;
|
| }
|
|
|
| - virtual void CancelRequest(RequestHandle request) OVERRIDE {
|
| + virtual void CancelRequest(RequestHandle request) override {
|
| NOTREACHED();
|
| }
|
|
|
| - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE {
|
| + virtual LoadState GetLoadState(RequestHandle request) const override {
|
| NOTREACHED();
|
| return LOAD_STATE_IDLE;
|
| }
|
|
|
| - virtual void CancelSetPacScript() OVERRIDE {
|
| + virtual void CancelSetPacScript() override {
|
| NOTREACHED();
|
| }
|
|
|
| virtual int SetPacScript(
|
| const scoped_refptr<ProxyResolverScriptData>& pac_script,
|
| - const CompletionCallback& callback) OVERRIDE {
|
| + const CompletionCallback& callback) override {
|
| return OK;
|
| }
|
|
|
| @@ -250,7 +250,7 @@ class ProxyResolverFactoryForSystem : public ProxyResolverFactory {
|
| ProxyResolverFactoryForSystem()
|
| : ProxyResolverFactory(false /*expects_pac_bytes*/) {}
|
|
|
| - virtual ProxyResolver* CreateProxyResolver() OVERRIDE {
|
| + virtual ProxyResolver* CreateProxyResolver() override {
|
| DCHECK(IsSupported());
|
| #if defined(OS_WIN)
|
| return new ProxyResolverWinHttp();
|
| @@ -313,10 +313,10 @@ class UnsetProxyConfigService : public ProxyConfigService {
|
| UnsetProxyConfigService() {}
|
| virtual ~UnsetProxyConfigService() {}
|
|
|
| - virtual void AddObserver(Observer* observer) OVERRIDE {}
|
| - virtual void RemoveObserver(Observer* observer) OVERRIDE {}
|
| + virtual void AddObserver(Observer* observer) override {}
|
| + virtual void RemoveObserver(Observer* observer) override {}
|
| virtual ConfigAvailability GetLatestProxyConfig(
|
| - ProxyConfig* config) OVERRIDE {
|
| + ProxyConfig* config) override {
|
| return CONFIG_UNSET;
|
| }
|
| };
|
|
|