Index: net/url_request/url_fetcher_impl_unittest.cc |
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc |
index 2f1acce2e5073eb12b4e5c67d69a1040113e53ae..5c97366eb3db0d5adb6edead038318ca06090c66 100644 |
--- a/net/url_request/url_fetcher_impl_unittest.cc |
+++ b/net/url_request/url_fetcher_impl_unittest.cc |
@@ -67,7 +67,7 @@ class ThrottlingTestURLRequestContextGetter |
} |
// TestURLRequestContextGetter: |
- virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE { |
+ virtual TestURLRequestContext* GetURLRequestContext() override { |
return context_; |
} |
@@ -95,7 +95,7 @@ class URLFetcherTest : public testing::Test, |
// Subclasses that override this should either call this function or |
// CleanupAfterFetchComplete() at the end of their processing, depending on |
// whether they want to check for a non-empty HTTP 200 response or not. |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
// Deletes |fetcher| and terminates the message loop. |
void CleanupAfterFetchComplete(); |
@@ -110,7 +110,7 @@ class URLFetcherTest : public testing::Test, |
protected: |
// testing::Test: |
- virtual void SetUp() OVERRIDE { |
+ virtual void SetUp() override { |
testing::Test::SetUp(); |
context_.reset(new ThrottlingTestURLRequestContext()); |
@@ -122,7 +122,7 @@ class URLFetcherTest : public testing::Test, |
#endif |
} |
- virtual void TearDown() OVERRIDE { |
+ virtual void TearDown() override { |
#if defined(USE_NSS) || defined(OS_IOS) |
ShutdownNSSHttpIO(); |
#endif |
@@ -143,13 +143,13 @@ class URLFetcherTest : public testing::Test, |
class URLFetcherMockDnsTest : public URLFetcherTest { |
public: |
// testing::Test: |
- virtual void SetUp() OVERRIDE; |
+ virtual void SetUp() override; |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
protected: |
GURL test_url_; |
@@ -231,10 +231,10 @@ namespace { |
class URLFetcherPostTest : public URLFetcherTest { |
public: |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
}; |
// Version of URLFetcherTest that does a POST of a file using |
@@ -249,10 +249,10 @@ class URLFetcherPostFileTest : public URLFetcherTest { |
} |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
private: |
base::FilePath path_; |
@@ -264,10 +264,10 @@ class URLFetcherPostFileTest : public URLFetcherTest { |
class URLFetcherEmptyPostTest : public URLFetcherTest { |
public: |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
}; |
// Version of URLFetcherTest that tests download progress reports. |
@@ -279,12 +279,12 @@ class URLFetcherDownloadProgressTest : public URLFetcherTest { |
} |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
virtual void OnURLFetchDownloadProgress(const URLFetcher* source, |
int64 current, |
- int64 total) OVERRIDE; |
+ int64 total) override; |
protected: |
// Download progress returned by the previous callback. |
@@ -298,13 +298,13 @@ class URLFetcherDownloadProgressTest : public URLFetcherTest { |
class URLFetcherDownloadProgressCancelTest : public URLFetcherTest { |
public: |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
virtual void OnURLFetchDownloadProgress(const URLFetcher* source, |
int64 current, |
- int64 total) OVERRIDE; |
+ int64 total) override; |
protected: |
bool cancelled_; |
}; |
@@ -313,12 +313,12 @@ class URLFetcherDownloadProgressCancelTest : public URLFetcherTest { |
class URLFetcherUploadProgressTest : public URLFetcherTest { |
public: |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
virtual void OnURLFetchUploadProgress(const URLFetcher* source, |
int64 current, |
- int64 total) OVERRIDE; |
+ int64 total) override; |
protected: |
int64 previous_progress_; |
std::string chunk_; |
@@ -329,14 +329,14 @@ class URLFetcherUploadProgressTest : public URLFetcherTest { |
class URLFetcherHeadersTest : public URLFetcherTest { |
public: |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
}; |
// Version of URLFetcherTest that tests SocketAddress. |
class URLFetcherSocketAddressTest : public URLFetcherTest { |
public: |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
protected: |
std::string expected_host_; |
uint16 expected_port_; |
@@ -349,10 +349,10 @@ class URLFetcherStopOnRedirectTest : public URLFetcherTest { |
virtual ~URLFetcherStopOnRedirectTest(); |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
protected: |
// The URL we should be redirected to. |
@@ -365,10 +365,10 @@ class URLFetcherStopOnRedirectTest : public URLFetcherTest { |
class URLFetcherProtectTest : public URLFetcherTest { |
public: |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
private: |
Time start_time_; |
}; |
@@ -378,10 +378,10 @@ class URLFetcherProtectTest : public URLFetcherTest { |
class URLFetcherProtectTestPassedThrough : public URLFetcherTest { |
public: |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
private: |
Time start_time_; |
}; |
@@ -392,7 +392,7 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest { |
URLFetcherBadHTTPSTest(); |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
private: |
base::FilePath cert_dir_; |
@@ -402,10 +402,10 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest { |
class URLFetcherCancelTest : public URLFetcherTest { |
public: |
// URLFetcherTest: |
- virtual void CreateFetcher(const GURL& url) OVERRIDE; |
+ virtual void CreateFetcher(const GURL& url) override; |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
void CancelRequest(); |
}; |
@@ -439,7 +439,7 @@ class CancelTestURLRequestContextGetter |
} |
// TestURLRequestContextGetter: |
- virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE { |
+ virtual TestURLRequestContext* GetURLRequestContext() override { |
if (!context_.get()) { |
context_.reset(new CancelTestURLRequestContext()); |
DCHECK(context_->throttler_manager()); |
@@ -487,7 +487,7 @@ class CancelTestURLRequestContextGetter |
class URLFetcherMultipleAttemptTest : public URLFetcherTest { |
public: |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
private: |
std::string data_; |
}; |
@@ -501,7 +501,7 @@ class URLFetcherFileTest : public URLFetcherTest { |
void CreateFetcherForTempFile(const GURL& url); |
// URLFetcherDelegate: |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const URLFetcher* source) override; |
protected: |
base::FilePath expected_file_; |