| Index: net/proxy/multi_threaded_proxy_resolver.cc
|
| diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc
|
| index 4b68321a4023d5df4b2c9b1944ff1b6107931eb2..a2a651515d0d385cb80159a4bfe7a40f8e8c083f 100644
|
| --- a/net/proxy/multi_threaded_proxy_resolver.cc
|
| +++ b/net/proxy/multi_threaded_proxy_resolver.cc
|
| @@ -175,7 +175,7 @@ class MultiThreadedProxyResolver::SetPacScriptJob
|
| }
|
|
|
| // Runs on the worker thread.
|
| - virtual void Run(scoped_refptr<base::MessageLoopProxy> origin_loop) OVERRIDE {
|
| + virtual void Run(scoped_refptr<base::MessageLoopProxy> origin_loop) override {
|
| ProxyResolver* resolver = executor()->resolver();
|
| int rv = resolver->SetPacScript(script_data_, CompletionCallback());
|
|
|
| @@ -222,12 +222,12 @@ class MultiThreadedProxyResolver::GetProxyForURLJob
|
|
|
| BoundNetLog* net_log() { return &net_log_; }
|
|
|
| - virtual void WaitingForThread() OVERRIDE {
|
| + virtual void WaitingForThread() override {
|
| was_waiting_for_thread_ = true;
|
| net_log_.BeginEvent(NetLog::TYPE_WAITING_FOR_PROXY_RESOLVER_THREAD);
|
| }
|
|
|
| - virtual void FinishedWaitingForThread() OVERRIDE {
|
| + virtual void FinishedWaitingForThread() override {
|
| DCHECK(executor());
|
|
|
| if (was_waiting_for_thread_) {
|
| @@ -240,7 +240,7 @@ class MultiThreadedProxyResolver::GetProxyForURLJob
|
| }
|
|
|
| // Runs on the worker thread.
|
| - virtual void Run(scoped_refptr<base::MessageLoopProxy> origin_loop) OVERRIDE {
|
| + virtual void Run(scoped_refptr<base::MessageLoopProxy> origin_loop) override {
|
| ProxyResolver* resolver = executor()->resolver();
|
| int rv = resolver->GetProxyForURL(
|
| url_, &results_buf_, CompletionCallback(), NULL, net_log_);
|
|
|