| Index: chrome/browser/net/dns_probe_browsertest.cc
|
| diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc
|
| index a3c71b2c3a02fc64fc4046ad478a523f7dca3597..d536aae8ba891909a530835fde10038f2d5d5e1a 100644
|
| --- a/chrome/browser/net/dns_probe_browsertest.cc
|
| +++ b/chrome/browser/net/dns_probe_browsertest.cc
|
| @@ -82,7 +82,7 @@ class DelayingDnsProbeService : public DnsProbeService {
|
| EXPECT_TRUE(delayed_probes_.empty());
|
| }
|
|
|
| - virtual void ProbeDns(const ProbeCallback& callback) OVERRIDE {
|
| + virtual void ProbeDns(const ProbeCallback& callback) override {
|
| delayed_probes_.push_back(callback);
|
| }
|
|
|
| @@ -143,7 +143,7 @@ class DelayableURLRequestFailedJob : public URLRequestFailedJob,
|
| start_delayed_(false),
|
| destruction_callback_(destruction_callback) {}
|
|
|
| - virtual void Start() OVERRIDE {
|
| + virtual void Start() override {
|
| if (should_delay_) {
|
| DCHECK(!start_delayed_);
|
| start_delayed_ = true;
|
| @@ -152,7 +152,7 @@ class DelayableURLRequestFailedJob : public URLRequestFailedJob,
|
| URLRequestFailedJob::Start();
|
| }
|
|
|
| - virtual void Resume() OVERRIDE {
|
| + virtual void Resume() override {
|
| DCHECK(should_delay_);
|
| should_delay_ = false;
|
| if (start_delayed_) {
|
| @@ -191,7 +191,7 @@ class DelayableURLRequestMockHTTPJob : public URLRequestMockHTTPJob,
|
| start_delayed_(false),
|
| destruction_callback_(destruction_callback) {}
|
|
|
| - virtual void Start() OVERRIDE {
|
| + virtual void Start() override {
|
| if (should_delay_) {
|
| DCHECK(!start_delayed_);
|
| start_delayed_ = true;
|
| @@ -200,7 +200,7 @@ class DelayableURLRequestMockHTTPJob : public URLRequestMockHTTPJob,
|
| URLRequestMockHTTPJob::Start();
|
| }
|
|
|
| - virtual void Resume() OVERRIDE {
|
| + virtual void Resume() override {
|
| DCHECK(should_delay_);
|
| should_delay_ = false;
|
| if (start_delayed_) {
|
| @@ -242,7 +242,7 @@ class BreakableCorrectionInterceptor : public URLRequestInterceptor {
|
|
|
| virtual URLRequestJob* MaybeInterceptRequest(
|
| URLRequest* request,
|
| - NetworkDelegate* network_delegate) const OVERRIDE {
|
| + NetworkDelegate* network_delegate) const override {
|
| if (net_error_ != net::OK) {
|
| DelayableURLRequestFailedJob* job =
|
| new DelayableURLRequestFailedJob(
|
| @@ -433,8 +433,8 @@ class DnsProbeBrowserTest : public InProcessBrowserTest {
|
| DnsProbeBrowserTest();
|
| virtual ~DnsProbeBrowserTest();
|
|
|
| - virtual void SetUpOnMainThread() OVERRIDE;
|
| - virtual void TearDownOnMainThread() OVERRIDE;
|
| + virtual void SetUpOnMainThread() override;
|
| + virtual void TearDownOnMainThread() override;
|
|
|
| protected:
|
| // Sets the browser object that other methods apply to, and that has the
|
|
|