| Index: net/ftp/ftp_network_transaction_unittest.cc
|
| diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc
|
| index c058d38d728fea8546dbe48f0b2417fd26d02c6b..de407d569683309905b8d918b83062af7b263235 100644
|
| --- a/net/ftp/ftp_network_transaction_unittest.cc
|
| +++ b/net/ftp/ftp_network_transaction_unittest.cc
|
| @@ -63,7 +63,7 @@ class FtpSocketDataProvider : public DynamicSocketDataProvider {
|
| Init();
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -131,7 +131,7 @@ class FtpSocketDataProvider : public DynamicSocketDataProvider {
|
| return state_;
|
| }
|
|
|
| - virtual void Reset() OVERRIDE {
|
| + virtual void Reset() override {
|
| DynamicSocketDataProvider::Reset();
|
| Init();
|
| }
|
| @@ -205,7 +205,7 @@ class FtpSocketDataProviderDirectoryListing : public FtpSocketDataProvider {
|
| FtpSocketDataProviderDirectoryListing() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -232,7 +232,7 @@ class FtpSocketDataProviderDirectoryListingWithPasvFallback
|
| FtpSocketDataProviderDirectoryListingWithPasvFallback() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -258,7 +258,7 @@ class FtpSocketDataProviderDirectoryListingZeroSize
|
| FtpSocketDataProviderDirectoryListingZeroSize() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -278,7 +278,7 @@ class FtpSocketDataProviderVMSDirectoryListing : public FtpSocketDataProvider {
|
| FtpSocketDataProviderVMSDirectoryListing() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -312,7 +312,7 @@ class FtpSocketDataProviderVMSDirectoryListingRootDirectory
|
| FtpSocketDataProviderVMSDirectoryListingRootDirectory() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -348,7 +348,7 @@ class FtpSocketDataProviderFileDownloadWithFileTypecode
|
| FtpSocketDataProviderFileDownloadWithFileTypecode() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -371,7 +371,7 @@ class FtpSocketDataProviderFileDownload : public FtpSocketDataProvider {
|
| FtpSocketDataProviderFileDownload() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -398,7 +398,7 @@ class FtpSocketDataProviderFileNotFound : public FtpSocketDataProvider {
|
| FtpSocketDataProviderFileNotFound() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -428,7 +428,7 @@ class FtpSocketDataProviderFileDownloadWithPasvFallback
|
| FtpSocketDataProviderFileDownloadWithPasvFallback() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -453,7 +453,7 @@ class FtpSocketDataProviderFileDownloadZeroSize
|
| FtpSocketDataProviderFileDownloadZeroSize() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -479,7 +479,7 @@ class FtpSocketDataProviderFileDownloadCWD451
|
| FtpSocketDataProviderFileDownloadCWD451() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -501,7 +501,7 @@ class FtpSocketDataProviderVMSFileDownload : public FtpSocketDataProvider {
|
| FtpSocketDataProviderVMSFileDownload() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -536,7 +536,7 @@ class FtpSocketDataProviderEscaping : public FtpSocketDataProviderFileDownload {
|
| FtpSocketDataProviderEscaping() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -565,7 +565,7 @@ class FtpSocketDataProviderFileDownloadTransferStarting
|
| FtpSocketDataProviderFileDownloadTransferStarting() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -589,7 +589,7 @@ class FtpSocketDataProviderDirectoryListingTransferStarting
|
| FtpSocketDataProviderDirectoryListingTransferStarting() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -614,7 +614,7 @@ class FtpSocketDataProviderFileDownloadInvalidResponse
|
| FtpSocketDataProviderFileDownloadInvalidResponse() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -648,7 +648,7 @@ class FtpSocketDataProviderEvilEpsv : public FtpSocketDataProviderFileDownload {
|
| epsv_response_length_(epsv_response_length),
|
| expected_state_(expected_state) {}
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -676,7 +676,7 @@ class FtpSocketDataProviderEvilPasv
|
| expected_state_(expected_state) {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -701,7 +701,7 @@ class FtpSocketDataProviderEvilSize : public FtpSocketDataProviderFileDownload {
|
| expected_state_(expected_state) {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -728,7 +728,7 @@ class FtpSocketDataProviderEvilLogin
|
| expected_password_(expected_password) {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
| @@ -755,7 +755,7 @@ class FtpSocketDataProviderCloseConnection : public FtpSocketDataProvider {
|
| FtpSocketDataProviderCloseConnection() {
|
| }
|
|
|
| - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE {
|
| + virtual MockWriteResult OnWrite(const std::string& data) override {
|
| if (InjectFault())
|
| return MockWriteResult(ASYNC, data.length());
|
| switch (state()) {
|
|
|