| Index: net/proxy/proxy_resolver_v8_tracing_unittest.cc
|
| diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc
|
| index a6e38cba408c954ebbe872b175102e7fdbb84ad8..0c16a1a04391c396be0de717183d6b09cf9effef 100644
|
| --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc
|
| +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc
|
| @@ -70,8 +70,7 @@ class MockErrorObserver : public ProxyResolverErrorObserver {
|
| public:
|
| MockErrorObserver() : event_(true, false) {}
|
|
|
| - virtual void OnPACScriptError(int line_number,
|
| - const base::string16& error) override {
|
| + void OnPACScriptError(int line_number, const base::string16& error) override {
|
| {
|
| base::AutoLock l(lock_);
|
| output += base::StringPrintf("Error: line %d: %s\n", line_number,
|
| @@ -763,12 +762,12 @@ class BlockableHostResolver : public HostResolver {
|
| BlockableHostResolver()
|
| : num_cancelled_requests_(0), waiting_for_resolve_(false) {}
|
|
|
| - virtual int Resolve(const RequestInfo& info,
|
| - RequestPriority priority,
|
| - AddressList* addresses,
|
| - const CompletionCallback& callback,
|
| - RequestHandle* out_req,
|
| - const BoundNetLog& net_log) override {
|
| + int Resolve(const RequestInfo& info,
|
| + RequestPriority priority,
|
| + AddressList* addresses,
|
| + const CompletionCallback& callback,
|
| + RequestHandle* out_req,
|
| + const BoundNetLog& net_log) override {
|
| EXPECT_FALSE(callback.is_null());
|
| EXPECT_TRUE(out_req);
|
|
|
| @@ -789,14 +788,14 @@ class BlockableHostResolver : public HostResolver {
|
| return ERR_IO_PENDING;
|
| }
|
|
|
| - virtual int ResolveFromCache(const RequestInfo& info,
|
| - AddressList* addresses,
|
| - const BoundNetLog& net_log) override {
|
| + int ResolveFromCache(const RequestInfo& info,
|
| + AddressList* addresses,
|
| + const BoundNetLog& net_log) override {
|
| NOTREACHED();
|
| return ERR_DNS_CACHE_MISS;
|
| }
|
|
|
| - virtual void CancelRequest(RequestHandle req) override {
|
| + void CancelRequest(RequestHandle req) override {
|
| EXPECT_EQ(reinterpret_cast<RequestHandle*>(1), req);
|
| num_cancelled_requests_++;
|
| }
|
|
|