diff options
Diffstat (limited to 'net')
488 files changed, 3677 insertions, 3677 deletions
diff --git a/net/android/network_change_notifier_android.cc b/net/android/network_change_notifier_android.cc index 2461d64..410d1fb 100644 --- a/net/android/network_change_notifier_android.cc +++ b/net/android/network_change_notifier_android.cc @@ -81,14 +81,14 @@ class NetworkChangeNotifierAndroid::DnsConfigServiceThread Stop(); } - virtual void Init() OVERRIDE { + virtual void Init() override { address_tracker_.Init(); dns_config_service_ = DnsConfigService::CreateSystemService(); dns_config_service_->WatchConfig( base::Bind(&NetworkChangeNotifier::SetDnsConfig)); } - virtual void CleanUp() OVERRIDE { + virtual void CleanUp() override { dns_config_service_.reset(); } diff --git a/net/android/network_change_notifier_android.h b/net/android/network_change_notifier_android.h index e82b852..57d29b8 100644 --- a/net/android/network_change_notifier_android.h +++ b/net/android/network_change_notifier_android.h @@ -45,10 +45,10 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierAndroid virtual ~NetworkChangeNotifierAndroid(); // NetworkChangeNotifier: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE; + virtual ConnectionType GetCurrentConnectionType() const override; // NetworkChangeNotifierDelegateAndroid::Observer: - virtual void OnConnectionTypeChanged() OVERRIDE; + virtual void OnConnectionTypeChanged() override; static bool Register(JNIEnv* env); diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc index 6ab894c..6aadb54 100644 --- a/net/android/network_change_notifier_android_unittest.cc +++ b/net/android/network_change_notifier_android_unittest.cc @@ -24,7 +24,7 @@ class NetworkChangeNotifierDelegateAndroidObserver NetworkChangeNotifierDelegateAndroidObserver() : notifications_count_(0) {} // NetworkChangeNotifierDelegateAndroid::Observer: - virtual void OnConnectionTypeChanged() OVERRIDE { + virtual void OnConnectionTypeChanged() override { notifications_count_++; } @@ -43,7 +43,7 @@ class NetworkChangeNotifierObserver // NetworkChangeNotifier::Observer: virtual void OnConnectionTypeChanged( - NetworkChangeNotifier::ConnectionType connection_type) OVERRIDE { + NetworkChangeNotifier::ConnectionType connection_type) override { notifications_count_++; } diff --git a/net/android/network_change_notifier_factory_android.h b/net/android/network_change_notifier_factory_android.h index e71ec27..d443fcd 100644 --- a/net/android/network_change_notifier_factory_android.h +++ b/net/android/network_change_notifier_factory_android.h @@ -29,7 +29,7 @@ class NET_EXPORT NetworkChangeNotifierFactoryAndroid : virtual ~NetworkChangeNotifierFactoryAndroid(); // NetworkChangeNotifierFactory: - virtual NetworkChangeNotifier* CreateInstance() OVERRIDE; + virtual NetworkChangeNotifier* CreateInstance() override; private: // Delegate passed to the instances created by this class. diff --git a/net/base/address_tracker_linux.h b/net/base/address_tracker_linux.h index ec52b60..2574fc7 100644 --- a/net/base/address_tracker_linux.h +++ b/net/base/address_tracker_linux.h @@ -108,8 +108,8 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux : void AbortAndForceOnline(); // MessageLoopForIO::Watcher: - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int /* fd */) override; // Close |netlink_fd_| void CloseSocket(); diff --git a/net/base/backoff_entry_unittest.cc b/net/base/backoff_entry_unittest.cc index 560b213..f5393e8 100644 --- a/net/base/backoff_entry_unittest.cc +++ b/net/base/backoff_entry_unittest.cc @@ -25,7 +25,7 @@ class TestBackoffEntry : public BackoffEntry { virtual ~TestBackoffEntry() {} - virtual TimeTicks ImplGetTimeNow() const OVERRIDE { + virtual TimeTicks ImplGetTimeNow() const override { return now_; } diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h index 06bc976..a58b6ff 100644 --- a/net/base/capturing_net_log.h +++ b/net/base/capturing_net_log.h @@ -105,7 +105,7 @@ class CapturingNetLog : public NetLog { private: // ThreadSafeObserver implementation: - virtual void OnAddEntry(const Entry& entry) OVERRIDE; + virtual void OnAddEntry(const Entry& entry) override; // Needs to be "mutable" so can use it in GetEntries(). mutable base::Lock lock_; diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc index 970f0d7..f52e23e 100644 --- a/net/base/directory_lister_unittest.cc +++ b/net/base/directory_lister_unittest.cc @@ -28,14 +28,14 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate { } virtual void OnListFile( - const DirectoryLister::DirectoryListerData& data) OVERRIDE { + const DirectoryLister::DirectoryListerData& data) override { file_list_.push_back(data.info); paths_.push_back(data.path); if (quit_loop_after_each_file_) base::MessageLoop::current()->Quit(); } - virtual void OnListDone(int error) OVERRIDE { + virtual void OnListDone(int error) override { error_ = error; base::MessageLoop::current()->Quit(); if (recursive_) @@ -93,7 +93,7 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate { class DirectoryListerTest : public PlatformTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { const int kMaxDepth = 3; const int kBranchingFactor = 4; const int kFilesPerDirectory = 5; diff --git a/net/base/dns_reloader.cc b/net/base/dns_reloader.cc index 04abcb1..bcfa946 100644 --- a/net/base/dns_reloader.cc +++ b/net/base/dns_reloader.cc @@ -46,7 +46,7 @@ class DnsReloader : public net::NetworkChangeNotifier::DNSObserver { }; // NetworkChangeNotifier::DNSObserver: - virtual void OnDNSChanged() OVERRIDE { + virtual void OnDNSChanged() override { DCHECK(base::MessageLoopForIO::IsCurrent()); base::AutoLock l(lock_); resolver_generation_++; diff --git a/net/base/file_stream_context.h b/net/base/file_stream_context.h index 74f47c4..5493e25 100644 --- a/net/base/file_stream_context.h +++ b/net/base/file_stream_context.h @@ -158,7 +158,7 @@ class FileStream::Context { // Implementation of MessageLoopForIO::IOHandler. virtual void OnIOCompleted(base::MessageLoopForIO::IOContext* context, DWORD bytes_read, - DWORD error) OVERRIDE; + DWORD error) override; #elif defined(OS_POSIX) // ReadFileImpl() is a simple wrapper around read() that handles EINTR // signals and calls RecordAndMapError() to map errno to net error codes. diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index 2962330..af4e01d 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -34,11 +34,11 @@ class StubCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate { virtual std::string RequestPassword(const std::string& slot_name, bool retry, - bool* cancelled) OVERRIDE{ + bool* cancelled) override{ return std::string(); } - virtual crypto::ScopedPK11Slot RequestSlot() OVERRIDE { + virtual crypto::ScopedPK11Slot RequestSlot() override { return crypto::ScopedPK11Slot(PK11_ReferenceSlot(slot_.get())); } diff --git a/net/base/mock_file_stream.h b/net/base/mock_file_stream.h index 55261b4..abceb1b 100644 --- a/net/base/mock_file_stream.h +++ b/net/base/mock_file_stream.h @@ -29,14 +29,14 @@ class MockFileStream : public net::FileStream { // FileStream methods. virtual int Seek(base::File::Whence whence, int64 offset, - const Int64CompletionCallback& callback) OVERRIDE; + const Int64CompletionCallback& callback) override; virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int Flush(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual int Flush(const CompletionCallback& callback) override; void set_forced_error_async(int error) { forced_error_ = error; diff --git a/net/base/net_log_logger.h b/net/base/net_log_logger.h index fde820b..6604b82 100644 --- a/net/base/net_log_logger.h +++ b/net/base/net_log_logger.h @@ -41,7 +41,7 @@ class NET_EXPORT NetLogLogger : public NetLog::ThreadSafeObserver { void StopObserving(); // net::NetLog::ThreadSafeObserver implementation: - virtual void OnAddEntry(const NetLog::Entry& entry) OVERRIDE; + virtual void OnAddEntry(const NetLog::Entry& entry) override; // Create a dictionary containing legend for net/ constants. Caller takes // ownership of returned value. diff --git a/net/base/net_log_unittest.cc b/net/base/net_log_unittest.cc index 8f15e9c..d1e7dde 100644 --- a/net/base/net_log_unittest.cc +++ b/net/base/net_log_unittest.cc @@ -80,7 +80,7 @@ class CountingObserver : public NetLog::ThreadSafeObserver { net_log()->RemoveThreadSafeObserver(this); } - virtual void OnAddEntry(const NetLog::Entry& entry) OVERRIDE { + virtual void OnAddEntry(const NetLog::Entry& entry) override { ++count_; } @@ -99,7 +99,7 @@ class LoggingObserver : public NetLog::ThreadSafeObserver { net_log()->RemoveThreadSafeObserver(this); } - virtual void OnAddEntry(const NetLog::Entry& entry) OVERRIDE { + virtual void OnAddEntry(const NetLog::Entry& entry) override { base::Value* value = entry.ToValue(); base::DictionaryValue* dict = NULL; ASSERT_TRUE(value->GetAsDictionary(&dict)); @@ -138,7 +138,7 @@ class NetLogTestThread : public base::SimpleThread { net_log_ = net_log; } - virtual void Run() OVERRIDE { + virtual void Run() override { start_event_->Wait(); RunTestThread(); } @@ -165,7 +165,7 @@ class AddEventsTestThread : public NetLogTestThread { virtual ~AddEventsTestThread() {} private: - virtual void RunTestThread() OVERRIDE { + virtual void RunTestThread() override { for (int i = 0; i < kEvents; ++i) AddEvent(net_log_); } @@ -183,7 +183,7 @@ class AddRemoveObserverTestThread : public NetLogTestThread { } private: - virtual void RunTestThread() OVERRIDE { + virtual void RunTestThread() override { for (int i = 0; i < kEvents; ++i) { ASSERT_FALSE(observer_.net_log()); diff --git a/net/base/net_util_icu.cc b/net/base/net_util_icu.cc index 4094fee..bd5625b 100644 --- a/net/base/net_util_icu.cc +++ b/net/base/net_util_icu.cc @@ -493,7 +493,7 @@ class HostComponentTransform : public AppendComponentTransform { private: virtual base::string16 Execute( const std::string& component_text, - base::OffsetAdjuster::Adjustments* adjustments) const OVERRIDE { + base::OffsetAdjuster::Adjustments* adjustments) const override { return IDNToUnicodeWithAdjustments(component_text, languages_, adjustments); } @@ -510,7 +510,7 @@ class NonHostComponentTransform : public AppendComponentTransform { private: virtual base::string16 Execute( const std::string& component_text, - base::OffsetAdjuster::Adjustments* adjustments) const OVERRIDE { + base::OffsetAdjuster::Adjustments* adjustments) const override { return (unescape_rules_ == UnescapeRule::NONE) ? base::UTF8ToUTF16WithAdjustments(component_text, adjustments) : UnescapeAndDecodeUTF8URLComponentWithAdjustments(component_text, diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc index ef9e252..bea6759 100644 --- a/net/base/network_change_notifier.cc +++ b/net/base/network_change_notifier.cc @@ -45,7 +45,7 @@ NetworkChangeNotifierFactory* g_network_change_notifier_factory = NULL; class MockNetworkChangeNotifier : public NetworkChangeNotifier { public: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE { + virtual ConnectionType GetCurrentConnectionType() const override { return CONNECTION_UNKNOWN; } }; @@ -93,7 +93,7 @@ class HistogramWatcher } // NetworkChangeNotifier::IPAddressObserver implementation. - virtual void OnIPAddressChanged() OVERRIDE { + virtual void OnIPAddressChanged() override { DCHECK(thread_checker_.CalledOnValidThread()); UMA_HISTOGRAM_MEDIUM_TIMES("NCN.IPAddressChange", SinceLast(&last_ip_address_change_)); @@ -104,7 +104,7 @@ class HistogramWatcher // NetworkChangeNotifier::ConnectionTypeObserver implementation. virtual void OnConnectionTypeChanged( - NetworkChangeNotifier::ConnectionType type) OVERRIDE { + NetworkChangeNotifier::ConnectionType type) override { DCHECK(thread_checker_.CalledOnValidThread()); base::TimeTicks now = base::TimeTicks::Now(); int32 kilobytes_read = bytes_read_since_last_connection_change_ / 1000; @@ -264,7 +264,7 @@ class HistogramWatcher } // NetworkChangeNotifier::DNSObserver implementation. - virtual void OnDNSChanged() OVERRIDE { + virtual void OnDNSChanged() override { DCHECK(thread_checker_.CalledOnValidThread()); UMA_HISTOGRAM_MEDIUM_TIMES("NCN.DNSConfigChange", SinceLast(&last_dns_change_)); @@ -272,7 +272,7 @@ class HistogramWatcher // NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( - NetworkChangeNotifier::ConnectionType type) OVERRIDE { + NetworkChangeNotifier::ConnectionType type) override { DCHECK(thread_checker_.CalledOnValidThread()); if (type != NetworkChangeNotifier::CONNECTION_NONE) { UMA_HISTOGRAM_MEDIUM_TIMES("NCN.NetworkOnlineChange", @@ -432,7 +432,7 @@ class NetworkChangeNotifier::NetworkChangeCalculator } // NetworkChangeNotifier::IPAddressObserver implementation. - virtual void OnIPAddressChanged() OVERRIDE { + virtual void OnIPAddressChanged() override { DCHECK(thread_checker_.CalledOnValidThread()); base::TimeDelta delay = last_announced_connection_type_ == CONNECTION_NONE ? params_.ip_address_offline_delay_ : params_.ip_address_online_delay_; @@ -441,7 +441,7 @@ class NetworkChangeNotifier::NetworkChangeCalculator } // NetworkChangeNotifier::ConnectionTypeObserver implementation. - virtual void OnConnectionTypeChanged(ConnectionType type) OVERRIDE { + virtual void OnConnectionTypeChanged(ConnectionType type) override { DCHECK(thread_checker_.CalledOnValidThread()); pending_connection_type_ = type; base::TimeDelta delay = last_announced_connection_type_ == CONNECTION_NONE diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc index 3fe9656..b10f8a8 100644 --- a/net/base/network_change_notifier_linux.cc +++ b/net/base/network_change_notifier_linux.cc @@ -29,8 +29,8 @@ class NetworkChangeNotifierLinux::Thread : public base::Thread { protected: // base::Thread - virtual void Init() OVERRIDE; - virtual void CleanUp() OVERRIDE; + virtual void Init() override; + virtual void CleanUp() override; private: scoped_ptr<DnsConfigService> dns_config_service_; diff --git a/net/base/network_change_notifier_linux.h b/net/base/network_change_notifier_linux.h index a7080d9..1e8a7eb 100644 --- a/net/base/network_change_notifier_linux.h +++ b/net/base/network_change_notifier_linux.h @@ -26,10 +26,10 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierLinux static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsLinux(); // NetworkChangeNotifier: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE; + virtual ConnectionType GetCurrentConnectionType() const override; virtual const internal::AddressTrackerLinux* - GetAddressTrackerInternal() const OVERRIDE; + GetAddressTrackerInternal() const override; // The thread used to listen for notifications. This relays the notification // to the registered observers without posting back to the thread the object diff --git a/net/base/network_change_notifier_mac.cc b/net/base/network_change_notifier_mac.cc index 7fa97b4..e378418 100644 --- a/net/base/network_change_notifier_mac.cc +++ b/net/base/network_change_notifier_mac.cc @@ -47,12 +47,12 @@ class NetworkChangeNotifierMac::DnsConfigServiceThread : public base::Thread { Stop(); } - virtual void Init() OVERRIDE { + virtual void Init() override { service_ = DnsConfigService::CreateSystemService(); service_->WatchConfig(base::Bind(&NetworkChangeNotifier::SetDnsConfig)); } - virtual void CleanUp() OVERRIDE { + virtual void CleanUp() override { service_.reset(); } diff --git a/net/base/network_change_notifier_mac.h b/net/base/network_change_notifier_mac.h index 168ea14..1598c4c 100644 --- a/net/base/network_change_notifier_mac.h +++ b/net/base/network_change_notifier_mac.h @@ -24,7 +24,7 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier { virtual ~NetworkChangeNotifierMac(); // NetworkChangeNotifier implementation: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE; + virtual ConnectionType GetCurrentConnectionType() const override; // Forwarder just exists to keep the NetworkConfigWatcherMac API out of // NetworkChangeNotifierMac's public API. @@ -34,11 +34,11 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier { : net_config_watcher_(net_config_watcher) {} // NetworkConfigWatcherMac::Delegate implementation: - virtual void Init() OVERRIDE; - virtual void StartReachabilityNotifications() OVERRIDE; + virtual void Init() override; + virtual void StartReachabilityNotifications() override; virtual void SetDynamicStoreNotificationKeys( - SCDynamicStoreRef store) OVERRIDE; - virtual void OnNetworkConfigChange(CFArrayRef changed_keys) OVERRIDE; + SCDynamicStoreRef store) override; + virtual void OnNetworkConfigChange(CFArrayRef changed_keys) override; private: NetworkChangeNotifierMac* const net_config_watcher_; diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc index 4580fa8..2255681 100644 --- a/net/base/network_change_notifier_win.cc +++ b/net/base/network_change_notifier_win.cc @@ -37,12 +37,12 @@ class NetworkChangeNotifierWin::DnsConfigServiceThread : public base::Thread { Stop(); } - virtual void Init() OVERRIDE { + virtual void Init() override { service_ = DnsConfigService::CreateSystemService(); service_->WatchConfig(base::Bind(&NetworkChangeNotifier::SetDnsConfig)); } - virtual void CleanUp() OVERRIDE { + virtual void CleanUp() override { service_.reset(); } diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h index 4ded749..9de1789 100644 --- a/net/base/network_change_notifier_win.h +++ b/net/base/network_change_notifier_win.h @@ -51,11 +51,11 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierWin friend class NetworkChangeNotifierWinTest; // NetworkChangeNotifier methods: - virtual ConnectionType GetCurrentConnectionType() const OVERRIDE; + virtual ConnectionType GetCurrentConnectionType() const override; // ObjectWatcher::Delegate methods: // Must only be called on the thread |this| was created on. - virtual void OnObjectSignaled(HANDLE object) OVERRIDE; + virtual void OnObjectSignaled(HANDLE object) override; // Does the actual work to determine the current connection type. // It is not thread safe, see crbug.com/324913. diff --git a/net/base/network_change_notifier_win_unittest.cc b/net/base/network_change_notifier_win_unittest.cc index 979105f1..25873c3 100644 --- a/net/base/network_change_notifier_win_unittest.cc +++ b/net/base/network_change_notifier_win_unittest.cc @@ -32,7 +32,7 @@ class TestNetworkChangeNotifierWin : public NetworkChangeNotifierWin { // From NetworkChangeNotifierWin. virtual NetworkChangeNotifier::ConnectionType - RecomputeCurrentConnectionType() const OVERRIDE { + RecomputeCurrentConnectionType() const override { return NetworkChangeNotifier::CONNECTION_UNKNOWN; } diff --git a/net/base/network_config_watcher_mac.cc b/net/base/network_config_watcher_mac.cc index 8579a35..7d2377c 100644 --- a/net/base/network_config_watcher_mac.cc +++ b/net/base/network_config_watcher_mac.cc @@ -35,8 +35,8 @@ class NetworkConfigWatcherMacThread : public base::Thread { protected: // base::Thread - virtual void Init() OVERRIDE; - virtual void CleanUp() OVERRIDE; + virtual void Init() override; + virtual void CleanUp() override; private: // The SystemConfiguration calls in this function can lead to contention early diff --git a/net/base/prioritized_dispatcher_unittest.cc b/net/base/prioritized_dispatcher_unittest.cc index 3036038..4cdf53b 100644 --- a/net/base/prioritized_dispatcher_unittest.cc +++ b/net/base/prioritized_dispatcher_unittest.cc @@ -117,7 +117,7 @@ class PrioritizedDispatcherTest : public testing::Test { } // PriorityDispatch::Job interface - virtual void Start() OVERRIDE { + virtual void Start() override { EXPECT_FALSE(running_); handle_ = PrioritizedDispatcher::Handle(); running_ = true; diff --git a/net/base/priority_queue_unittest.cc b/net/base/priority_queue_unittest.cc index 8093319..87a8299 100644 --- a/net/base/priority_queue_unittest.cc +++ b/net/base/priority_queue_unittest.cc @@ -25,7 +25,7 @@ class PriorityQueueTest : public testing::Test { protected: PriorityQueueTest() : queue_(kNumPriorities) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CheckEmpty(); for (size_t i = 0; i < kNumElements; ++i) { EXPECT_EQ(i, queue_.size()); diff --git a/net/base/sdch_dictionary_fetcher.h b/net/base/sdch_dictionary_fetcher.h index f70d56a..86aaf48 100644 --- a/net/base/sdch_dictionary_fetcher.h +++ b/net/base/sdch_dictionary_fetcher.h @@ -44,12 +44,12 @@ class NET_EXPORT SdchDictionaryFetcher virtual ~SdchDictionaryFetcher(); // Implementation of SdchFetcher methods. - virtual void Schedule(const GURL& dictionary_url) OVERRIDE; - virtual void Cancel() OVERRIDE; + virtual void Schedule(const GURL& dictionary_url) override; + virtual void Cancel() override; // Implementation of URLRequest::Delegate methods. - virtual void OnResponseStarted(URLRequest* request) OVERRIDE; - virtual void OnReadCompleted(URLRequest* request, int bytes_read) OVERRIDE; + virtual void OnResponseStarted(URLRequest* request) override; + virtual void OnReadCompleted(URLRequest* request, int bytes_read) override; private: enum State { diff --git a/net/base/sdch_dictionary_fetcher_unittest.cc b/net/base/sdch_dictionary_fetcher_unittest.cc index 09155b8..a8b3040 100644 --- a/net/base/sdch_dictionary_fetcher_unittest.cc +++ b/net/base/sdch_dictionary_fetcher_unittest.cc @@ -62,7 +62,7 @@ class URLRequestSpecifiedResponseJob : public URLRequestSimpleJob { virtual int GetData(std::string* mime_type, std::string* charset, std::string* data, - const CompletionCallback& callback) const OVERRIDE { + const CompletionCallback& callback) const override { GURL url(request_->url()); *data = ExpectedResponseForURL(url); return OK; @@ -87,7 +87,7 @@ class SdchTestDelegate : public SdchFetcher::Delegate { }; virtual void AddSdchDictionary(const std::string& dictionary_text, - const GURL& dictionary_url) OVERRIDE { + const GURL& dictionary_url) override { dictionary_additions.push_back( DictionaryAdditions(dictionary_text, dictionary_url)); } @@ -105,7 +105,7 @@ class SdchDictionaryFetcherTest : public ::testing::Test { public: SdchDictionaryFetcherTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DCHECK(!fetcher_.get()); URLRequestSpecifiedResponseJob::AddUrlHandler(); @@ -115,7 +115,7 @@ class SdchDictionaryFetcherTest : public ::testing::Test { fetcher_delegate_.get(), context_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { URLRequestSpecifiedResponseJob::RemoveUrlHandler(); fetcher_.reset(); context_.reset(); diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h index 7d2c103..18f6749 100644 --- a/net/base/sdch_manager.h +++ b/net/base/sdch_manager.h @@ -356,7 +356,7 @@ class NET_EXPORT SdchManager // (data in the dictionary is not acceptable from the // dictionary_url; dictionary already added, etc.). virtual void AddSdchDictionary(const std::string& dictionary_text, - const GURL& dictionary_url) OVERRIDE; + const GURL& dictionary_url) override; private: struct BlacklistInfo { diff --git a/net/base/test_completion_callback.h b/net/base/test_completion_callback.h index 4a0afe1..469d12f 100644 --- a/net/base/test_completion_callback.h +++ b/net/base/test_completion_callback.h @@ -117,7 +117,7 @@ class ReleaseBufferCompletionCallback: public TestCompletionCallback { virtual ~ReleaseBufferCompletionCallback(); private: - virtual void SetResult(int result) OVERRIDE; + virtual void SetResult(int result) override; IOBuffer* buffer_; DISALLOW_COPY_AND_ASSIGN(ReleaseBufferCompletionCallback); diff --git a/net/base/trace_net_log_observer.cc b/net/base/trace_net_log_observer.cc index fb4f054..77945fb 100644 --- a/net/base/trace_net_log_observer.cc +++ b/net/base/trace_net_log_observer.cc @@ -26,7 +26,7 @@ class TracedValue : public base::debug::ConvertableToTraceFormat { private: virtual ~TracedValue() {} - virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE { + virtual void AppendAsTraceFormat(std::string* out) const override { if (value_) { std::string tmp; base::JSONWriter::Write(value_.get(), &tmp); diff --git a/net/base/trace_net_log_observer.h b/net/base/trace_net_log_observer.h index ed46fdb..567ba3f 100644 --- a/net/base/trace_net_log_observer.h +++ b/net/base/trace_net_log_observer.h @@ -22,7 +22,7 @@ class NET_EXPORT TraceNetLogObserver virtual ~TraceNetLogObserver(); // net::NetLog::ThreadSafeObserver implementation: - virtual void OnAddEntry(const NetLog::Entry& entry) OVERRIDE; + virtual void OnAddEntry(const NetLog::Entry& entry) override; // Start to watch for TraceLog enable and disable events. // This can't be called if already watching for events. @@ -35,8 +35,8 @@ class NET_EXPORT TraceNetLogObserver void StopWatchForTraceStart(); // base::debug::TraceLog::EnabledStateChangedObserver implementation: - virtual void OnTraceLogEnabled() OVERRIDE; - virtual void OnTraceLogDisabled() OVERRIDE; + virtual void OnTraceLogEnabled() override; + virtual void OnTraceLogDisabled() override; private: NetLog* net_log_to_watch_; diff --git a/net/base/upload_bytes_element_reader.h b/net/base/upload_bytes_element_reader.h index 9c7daf3..589e287 100644 --- a/net/base/upload_bytes_element_reader.h +++ b/net/base/upload_bytes_element_reader.h @@ -26,14 +26,14 @@ class NET_EXPORT UploadBytesElementReader : public UploadElementReader { uint64 length() const { return length_; } // UploadElementReader overrides: - virtual const UploadBytesElementReader* AsBytesReader() const OVERRIDE; - virtual int Init(const CompletionCallback& callback) OVERRIDE; - virtual uint64 GetContentLength() const OVERRIDE; - virtual uint64 BytesRemaining() const OVERRIDE; - virtual bool IsInMemory() const OVERRIDE; + virtual const UploadBytesElementReader* AsBytesReader() const override; + virtual int Init(const CompletionCallback& callback) override; + virtual uint64 GetContentLength() const override; + virtual uint64 BytesRemaining() const override; + virtual bool IsInMemory() const override; virtual int Read(IOBuffer* buf, int buf_length, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: const char* const bytes_; diff --git a/net/base/upload_bytes_element_reader_unittest.cc b/net/base/upload_bytes_element_reader_unittest.cc index 1aad55e..e15bbcf 100644 --- a/net/base/upload_bytes_element_reader_unittest.cc +++ b/net/base/upload_bytes_element_reader_unittest.cc @@ -15,7 +15,7 @@ namespace net { class UploadBytesElementReaderTest : public PlatformTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { const char kData[] = "123abc"; bytes_.assign(kData, kData + arraysize(kData)); reader_.reset(new UploadBytesElementReader(&bytes_[0], bytes_.size())); diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc index 2df38cd..03c75d6 100644 --- a/net/base/upload_data_stream_unittest.cc +++ b/net/base/upload_data_stream_unittest.cc @@ -67,9 +67,9 @@ class MockUploadElementReader : public UploadElementReader { // UploadElementReader overrides. MOCK_METHOD1(Init, int(const CompletionCallback& callback)); - virtual uint64 GetContentLength() const OVERRIDE { return content_length_; } - virtual uint64 BytesRemaining() const OVERRIDE { return bytes_remaining_; } - virtual bool IsInMemory() const OVERRIDE { return is_in_memory_; } + virtual uint64 GetContentLength() const override { return content_length_; } + virtual uint64 BytesRemaining() const override { return bytes_remaining_; } + virtual bool IsInMemory() const override { return is_in_memory_; } MOCK_METHOD3(Read, int(IOBuffer* buf, int buf_length, const CompletionCallback& callback)); diff --git a/net/base/upload_file_element_reader.h b/net/base/upload_file_element_reader.h index 88e95bf..868f804 100644 --- a/net/base/upload_file_element_reader.h +++ b/net/base/upload_file_element_reader.h @@ -42,13 +42,13 @@ class NET_EXPORT UploadFileElementReader : public UploadElementReader { } // UploadElementReader overrides: - virtual const UploadFileElementReader* AsFileReader() const OVERRIDE; - virtual int Init(const CompletionCallback& callback) OVERRIDE; - virtual uint64 GetContentLength() const OVERRIDE; - virtual uint64 BytesRemaining() const OVERRIDE; + virtual const UploadFileElementReader* AsFileReader() const override; + virtual int Init(const CompletionCallback& callback) override; + virtual uint64 GetContentLength() const override; + virtual uint64 BytesRemaining() const override; virtual int Read(IOBuffer* buf, int buf_length, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: FRIEND_TEST_ALL_PREFIXES(UploadDataStreamTest, FileSmallerThanLength); diff --git a/net/cert/cert_verify_proc_android.h b/net/cert/cert_verify_proc_android.h index ca8746b..7002718 100644 --- a/net/cert/cert_verify_proc_android.h +++ b/net/cert/cert_verify_proc_android.h @@ -15,7 +15,7 @@ class CertVerifyProcAndroid : public CertVerifyProc { public: CertVerifyProcAndroid(); - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE; + virtual bool SupportsAdditionalTrustAnchors() const override; protected: virtual ~CertVerifyProcAndroid(); @@ -26,7 +26,7 @@ class CertVerifyProcAndroid : public CertVerifyProc { int flags, CRLSet* crl_set, const CertificateList& additional_trust_anchors, - CertVerifyResult* verify_result) OVERRIDE; + CertVerifyResult* verify_result) override; }; } // namespace net diff --git a/net/cert/cert_verify_proc_mac.h b/net/cert/cert_verify_proc_mac.h index cb55767..f26768f 100644 --- a/net/cert/cert_verify_proc_mac.h +++ b/net/cert/cert_verify_proc_mac.h @@ -15,7 +15,7 @@ class CertVerifyProcMac : public CertVerifyProc { public: CertVerifyProcMac(); - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE; + virtual bool SupportsAdditionalTrustAnchors() const override; protected: virtual ~CertVerifyProcMac(); @@ -26,7 +26,7 @@ class CertVerifyProcMac : public CertVerifyProc { int flags, CRLSet* crl_set, const CertificateList& additional_trust_anchors, - CertVerifyResult* verify_result) OVERRIDE; + CertVerifyResult* verify_result) override; }; } // namespace net diff --git a/net/cert/cert_verify_proc_nss.h b/net/cert/cert_verify_proc_nss.h index d9971cf..e3eb11f 100644 --- a/net/cert/cert_verify_proc_nss.h +++ b/net/cert/cert_verify_proc_nss.h @@ -17,7 +17,7 @@ class NET_EXPORT_PRIVATE CertVerifyProcNSS : public CertVerifyProc { public: CertVerifyProcNSS(); - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE; + virtual bool SupportsAdditionalTrustAnchors() const override; protected: virtual ~CertVerifyProcNSS(); @@ -39,7 +39,7 @@ class NET_EXPORT_PRIVATE CertVerifyProcNSS : public CertVerifyProc { int flags, CRLSet* crl_set, const CertificateList& additional_trust_anchors, - CertVerifyResult* verify_result) OVERRIDE; + CertVerifyResult* verify_result) override; }; } // namespace net diff --git a/net/cert/cert_verify_proc_openssl.h b/net/cert/cert_verify_proc_openssl.h index d0d2574..ab1d0a3 100644 --- a/net/cert/cert_verify_proc_openssl.h +++ b/net/cert/cert_verify_proc_openssl.h @@ -14,7 +14,7 @@ class CertVerifyProcOpenSSL : public CertVerifyProc { public: CertVerifyProcOpenSSL(); - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE; + virtual bool SupportsAdditionalTrustAnchors() const override; protected: virtual ~CertVerifyProcOpenSSL(); @@ -25,7 +25,7 @@ class CertVerifyProcOpenSSL : public CertVerifyProc { int flags, CRLSet* crl_set, const CertificateList& additional_trust_anchors, - CertVerifyResult* verify_result) OVERRIDE; + CertVerifyResult* verify_result) override; }; } // namespace net diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc index 6890052..a71aa9a 100644 --- a/net/cert/cert_verify_proc_unittest.cc +++ b/net/cert/cert_verify_proc_unittest.cc @@ -58,7 +58,7 @@ class WellKnownCaCertVerifyProc : public CertVerifyProc { : is_well_known_(is_well_known) {} // CertVerifyProc implementation: - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE { return false; } + virtual bool SupportsAdditionalTrustAnchors() const override { return false; } protected: virtual ~WellKnownCaCertVerifyProc() {} @@ -69,7 +69,7 @@ class WellKnownCaCertVerifyProc : public CertVerifyProc { int flags, CRLSet* crl_set, const CertificateList& additional_trust_anchors, - CertVerifyResult* verify_result) OVERRIDE; + CertVerifyResult* verify_result) override; const bool is_well_known_; diff --git a/net/cert/cert_verify_proc_win.h b/net/cert/cert_verify_proc_win.h index 147f47a..afcb838 100644 --- a/net/cert/cert_verify_proc_win.h +++ b/net/cert/cert_verify_proc_win.h @@ -15,7 +15,7 @@ class CertVerifyProcWin : public CertVerifyProc { public: CertVerifyProcWin(); - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE; + virtual bool SupportsAdditionalTrustAnchors() const override; protected: virtual ~CertVerifyProcWin(); @@ -26,7 +26,7 @@ class CertVerifyProcWin : public CertVerifyProc { int flags, CRLSet* crl_set, const CertificateList& additional_trust_anchors, - CertVerifyResult* verify_result) OVERRIDE; + CertVerifyResult* verify_result) override; }; } // namespace net diff --git a/net/cert/ct_log_verifier_unittest.cc b/net/cert/ct_log_verifier_unittest.cc index 23cbf51..e2918c9 100644 --- a/net/cert/ct_log_verifier_unittest.cc +++ b/net/cert/ct_log_verifier_unittest.cc @@ -18,7 +18,7 @@ class CTLogVerifierTest : public ::testing::Test { public: CTLogVerifierTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { log_ = CTLogVerifier::Create(ct::GetTestPublicKey(), "testlog").Pass(); ASSERT_TRUE(log_); diff --git a/net/cert/ct_objects_extractor_unittest.cc b/net/cert/ct_objects_extractor_unittest.cc index 5feff3e..ac46755 100644 --- a/net/cert/ct_objects_extractor_unittest.cc +++ b/net/cert/ct_objects_extractor_unittest.cc @@ -20,7 +20,7 @@ namespace ct { class CTObjectsExtractorTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { precert_chain_ = CreateCertificateListFromFile(GetTestCertsDirectory(), "ct-test-embedded-cert.pem", diff --git a/net/cert/ct_serialization_unittest.cc b/net/cert/ct_serialization_unittest.cc index 866f961..ccf2d20 100644 --- a/net/cert/ct_serialization_unittest.cc +++ b/net/cert/ct_serialization_unittest.cc @@ -20,7 +20,7 @@ namespace net { class CtSerializationTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { test_digitally_signed_ = ct::GetTestDigitallySigned(); } diff --git a/net/cert/ev_root_ca_metadata_unittest.cc b/net/cert/ev_root_ca_metadata_unittest.cc index 1bb5475..90f4fa1 100644 --- a/net/cert/ev_root_ca_metadata_unittest.cc +++ b/net/cert/ev_root_ca_metadata_unittest.cc @@ -94,7 +94,7 @@ bool EVOidData::Init() { class EVRootCAMetadataTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(ev_oid_data.Init()); } diff --git a/net/cert/mock_cert_verifier.h b/net/cert/mock_cert_verifier.h index 5af7b7e..e76f78f 100644 --- a/net/cert/mock_cert_verifier.h +++ b/net/cert/mock_cert_verifier.h @@ -32,8 +32,8 @@ class MockCertVerifier : public CertVerifier { CertVerifyResult* verify_result, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle req) OVERRIDE; + const BoundNetLog& net_log) override; + virtual void CancelRequest(RequestHandle req) override; // Sets the default return value for Verify() for certificates/hosts that do // not have explicit results added via the AddResult*() methods. diff --git a/net/cert/multi_log_ct_verifier.h b/net/cert/multi_log_ct_verifier.h index 29fbdca..70adf52 100644 --- a/net/cert/multi_log_ct_verifier.h +++ b/net/cert/multi_log_ct_verifier.h @@ -41,7 +41,7 @@ class NET_EXPORT MultiLogCTVerifier : public CTVerifier { const std::string& stapled_ocsp_response, const std::string& sct_list_from_tls_extension, ct::CTVerifyResult* result, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; private: // Mapping from a log's ID to the verifier for this log. diff --git a/net/cert/multi_log_ct_verifier_unittest.cc b/net/cert/multi_log_ct_verifier_unittest.cc index 8edf4eb..17a670c 100644 --- a/net/cert/multi_log_ct_verifier_unittest.cc +++ b/net/cert/multi_log_ct_verifier_unittest.cc @@ -37,7 +37,7 @@ const char kSCTCountHistogram[] = class MultiLogCTVerifierTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { scoped_ptr<CTLogVerifier> log( CTLogVerifier::Create(ct::GetTestPublicKey(), kLogDescription)); ASSERT_TRUE(log); diff --git a/net/cert/multi_threaded_cert_verifier.h b/net/cert/multi_threaded_cert_verifier.h index cdd3235..2ca10f1 100644 --- a/net/cert/multi_threaded_cert_verifier.h +++ b/net/cert/multi_threaded_cert_verifier.h @@ -61,9 +61,9 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier CertVerifyResult* verify_result, const CompletionCallback& callback, CertVerifier::RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; - virtual void CancelRequest(CertVerifier::RequestHandle req) OVERRIDE; + virtual void CancelRequest(CertVerifier::RequestHandle req) override; private: friend class CertVerifierWorker; // Calls HandleResult. @@ -137,7 +137,7 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier const CertVerifyResult& verify_result); // CertDatabase::Observer methods: - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE; + virtual void OnCACertChanged(const X509Certificate* cert) override; // For unit testing. void ClearCache() { cache_.Clear(); } diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc index bf7de6d..651f78e 100644 --- a/net/cert/multi_threaded_cert_verifier_unittest.cc +++ b/net/cert/multi_threaded_cert_verifier_unittest.cc @@ -39,7 +39,7 @@ class MockCertVerifyProc : public CertVerifyProc { virtual ~MockCertVerifyProc() {} // CertVerifyProc implementation - virtual bool SupportsAdditionalTrustAnchors() const OVERRIDE { + virtual bool SupportsAdditionalTrustAnchors() const override { return false; } @@ -48,7 +48,7 @@ class MockCertVerifyProc : public CertVerifyProc { int flags, CRLSet* crl_set, const CertificateList& additional_trust_anchors, - CertVerifyResult* verify_result) OVERRIDE { + CertVerifyResult* verify_result) override { verify_result->Reset(); verify_result->verified_cert = cert; verify_result->cert_status = CERT_STATUS_COMMON_NAME_INVALID; diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc index 9707973..2c40e15 100644 --- a/net/cert/nss_cert_database.cc +++ b/net/cert/nss_cert_database.cc @@ -51,15 +51,15 @@ class CertNotificationForwarder : public NSSCertDatabase::Observer { virtual ~CertNotificationForwarder() {} // NSSCertDatabase::Observer implementation: - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE { + virtual void OnCertAdded(const X509Certificate* cert) override { cert_db_->NotifyObserversOfCertAdded(cert); } - virtual void OnCertRemoved(const X509Certificate* cert) OVERRIDE { + virtual void OnCertRemoved(const X509Certificate* cert) override { cert_db_->NotifyObserversOfCertRemoved(cert); } - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE { + virtual void OnCACertChanged(const X509Certificate* cert) override { cert_db_->NotifyObserversOfCACertChanged(cert); } diff --git a/net/cert/nss_cert_database_chromeos.h b/net/cert/nss_cert_database_chromeos.h index dfcefec..171ce28 100644 --- a/net/cert/nss_cert_database_chromeos.h +++ b/net/cert/nss_cert_database_chromeos.h @@ -25,12 +25,12 @@ class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { void SetSystemSlot(crypto::ScopedPK11Slot system_slot); // NSSCertDatabase implementation. - virtual void ListCertsSync(CertificateList* certs) OVERRIDE; + virtual void ListCertsSync(CertificateList* certs) override; virtual void ListCerts(const NSSCertDatabase::ListCertsCallback& callback) - OVERRIDE; + override; virtual void ListModules(CryptoModuleList* modules, bool need_rw) const - OVERRIDE; - virtual crypto::ScopedPK11Slot GetSystemSlot() const OVERRIDE; + override; + virtual crypto::ScopedPK11Slot GetSystemSlot() const override; // TODO(mattm): handle trust setting, deletion, etc correctly when certs exist // in multiple slots. diff --git a/net/cert/nss_cert_database_chromeos_unittest.cc b/net/cert/nss_cert_database_chromeos_unittest.cc index 5f790c9..caf5ea9 100644 --- a/net/cert/nss_cert_database_chromeos_unittest.cc +++ b/net/cert/nss_cert_database_chromeos_unittest.cc @@ -48,7 +48,7 @@ class NSSCertDatabaseChromeOSTest : public testing::Test, NSSCertDatabaseChromeOSTest() : observer_added_(false), user_1_("user1"), user_2_("user2") {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize nss_util slots. ASSERT_TRUE(user_1_.constructed_successfully()); ASSERT_TRUE(user_2_.constructed_successfully()); @@ -77,19 +77,19 @@ class NSSCertDatabaseChromeOSTest : public testing::Test, observer_added_ = true; } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (observer_added_) CertDatabase::GetInstance()->RemoveObserver(this); } // CertDatabase::Observer: - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE { + virtual void OnCertAdded(const X509Certificate* cert) override { added_.push_back(cert ? cert->os_cert_handle() : NULL); } - virtual void OnCertRemoved(const X509Certificate* cert) OVERRIDE {} + virtual void OnCertRemoved(const X509Certificate* cert) override {} - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE { + virtual void OnCACertChanged(const X509Certificate* cert) override { added_ca_.push_back(cert ? cert->os_cert_handle() : NULL); } diff --git a/net/cert/nss_profile_filter_chromeos_unittest.cc b/net/cert/nss_profile_filter_chromeos_unittest.cc index b48a527..1ebf399 100644 --- a/net/cert/nss_profile_filter_chromeos_unittest.cc +++ b/net/cert/nss_profile_filter_chromeos_unittest.cc @@ -58,7 +58,7 @@ class NSSProfileFilterChromeOSTest : public testing::Test { public: NSSProfileFilterChromeOSTest() : user_1_("user1"), user_2_("user2") {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(system_slot_user_.is_open()); ASSERT_TRUE(user_1_.constructed_successfully()); ASSERT_TRUE(user_2_.constructed_successfully()); diff --git a/net/cert/signed_certificate_timestamp_unittest.cc b/net/cert/signed_certificate_timestamp_unittest.cc index c758d65..dc60a27 100644 --- a/net/cert/signed_certificate_timestamp_unittest.cc +++ b/net/cert/signed_certificate_timestamp_unittest.cc @@ -20,7 +20,7 @@ const char kLogDescription[] = "somelog"; class SignedCertificateTimestampTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { GetX509CertSCT(&sample_sct_); sample_sct_->origin = SignedCertificateTimestamp::SCT_FROM_OCSP_RESPONSE; sample_sct_->log_description = kLogDescription; diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc index 4244f76..10a6f6b 100644 --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc @@ -428,7 +428,7 @@ class CookieMonster::SetCookieWithDetailsTask : public CookieMonsterTask { } // CookieMonsterTask: - virtual void Run() OVERRIDE; + virtual void Run() override; protected: virtual ~SetCookieWithDetailsTask() {} @@ -468,7 +468,7 @@ class CookieMonster::GetAllCookiesTask : public CookieMonsterTask { } // CookieMonsterTask - virtual void Run() OVERRIDE; + virtual void Run() override; protected: virtual ~GetAllCookiesTask() {} @@ -503,7 +503,7 @@ class CookieMonster::GetAllCookiesForURLWithOptionsTask } // CookieMonsterTask: - virtual void Run() OVERRIDE; + virtual void Run() override; protected: virtual ~GetAllCookiesForURLWithOptionsTask() {} @@ -544,7 +544,7 @@ class CookieMonster::DeleteTask : public CookieMonsterTask { } // CookieMonsterTask: - virtual void Run() OVERRIDE; + virtual void Run() override; private: // Runs the delete task and returns a result. @@ -596,7 +596,7 @@ class CookieMonster::DeleteAllTask : public DeleteTask<int> { } // DeleteTask: - virtual int RunDeleteTask() OVERRIDE; + virtual int RunDeleteTask() override; protected: virtual ~DeleteAllTask() {} @@ -622,7 +622,7 @@ class CookieMonster::DeleteAllCreatedBetweenTask : public DeleteTask<int> { } // DeleteTask: - virtual int RunDeleteTask() OVERRIDE; + virtual int RunDeleteTask() override; protected: virtual ~DeleteAllCreatedBetweenTask() {} @@ -650,7 +650,7 @@ class CookieMonster::DeleteAllForHostTask : public DeleteTask<int> { } // DeleteTask: - virtual int RunDeleteTask() OVERRIDE; + virtual int RunDeleteTask() override; protected: virtual ~DeleteAllForHostTask() {} @@ -682,7 +682,7 @@ class CookieMonster::DeleteAllCreatedBetweenForHostTask } // DeleteTask: - virtual int RunDeleteTask() OVERRIDE; + virtual int RunDeleteTask() override; protected: virtual ~DeleteAllCreatedBetweenForHostTask() {} @@ -711,7 +711,7 @@ class CookieMonster::DeleteCanonicalCookieTask : public DeleteTask<bool> { } // DeleteTask: - virtual bool RunDeleteTask() OVERRIDE; + virtual bool RunDeleteTask() override; protected: virtual ~DeleteCanonicalCookieTask() {} @@ -742,7 +742,7 @@ class CookieMonster::SetCookieWithOptionsTask : public CookieMonsterTask { } // CookieMonsterTask: - virtual void Run() OVERRIDE; + virtual void Run() override; protected: virtual ~SetCookieWithOptionsTask() {} @@ -779,7 +779,7 @@ class CookieMonster::GetCookiesWithOptionsTask : public CookieMonsterTask { } // CookieMonsterTask: - virtual void Run() OVERRIDE; + virtual void Run() override; protected: virtual ~GetCookiesWithOptionsTask() {} @@ -814,7 +814,7 @@ class CookieMonster::DeleteCookieTask : public DeleteTask<void> { } // DeleteTask: - virtual void RunDeleteTask() OVERRIDE; + virtual void RunDeleteTask() override; protected: virtual ~DeleteCookieTask() {} @@ -839,7 +839,7 @@ class CookieMonster::DeleteSessionCookiesTask : public DeleteTask<int> { } // DeleteTask: - virtual int RunDeleteTask() OVERRIDE; + virtual int RunDeleteTask() override; protected: virtual ~DeleteSessionCookiesTask() {} @@ -865,7 +865,7 @@ class CookieMonster::HasCookiesForETLDP1Task : public CookieMonsterTask { } // CookieMonsterTask: - virtual void Run() OVERRIDE; + virtual void Run() override; protected: virtual ~HasCookiesForETLDP1Task() {} diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h index ea448c5..746f2a4 100644 --- a/net/cookies/cookie_monster.h +++ b/net/cookies/cookie_monster.h @@ -243,7 +243,7 @@ class NET_EXPORT CookieMonster : public CookieStore { const GURL& url, const std::string& cookie_line, const CookieOptions& options, - const SetCookiesCallback& callback) OVERRIDE; + const SetCookiesCallback& callback) override; // Gets all cookies that apply to |url| given |options|. // The returned cookies are ordered by longest path, then earliest @@ -251,18 +251,18 @@ class NET_EXPORT CookieMonster : public CookieStore { virtual void GetCookiesWithOptionsAsync( const GURL& url, const CookieOptions& options, - const GetCookiesCallback& callback) OVERRIDE; + const GetCookiesCallback& callback) override; // Invokes GetAllCookiesForURLWithOptions with options set to include HTTP // only cookies. virtual void GetAllCookiesForURLAsync( const GURL& url, - const GetCookieListCallback& callback) OVERRIDE; + const GetCookieListCallback& callback) override; // Deletes all cookies with that might apply to |url| that has |cookie_name|. virtual void DeleteCookieAsync( const GURL& url, const std::string& cookie_name, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; // Deletes all of the cookies that have a creation_date greater than or equal // to |delete_begin| and less than |delete_end|. @@ -270,7 +270,7 @@ class NET_EXPORT CookieMonster : public CookieStore { virtual void DeleteAllCreatedBetweenAsync( const base::Time& delete_begin, const base::Time& delete_end, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; // Deletes all of the cookies that match the host of the given URL // regardless of path and that have a creation_date greater than or @@ -282,11 +282,11 @@ class NET_EXPORT CookieMonster : public CookieStore { const base::Time delete_begin, const base::Time delete_end, const GURL& url, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; - virtual void DeleteSessionCookiesAsync(const DeleteCallback&) OVERRIDE; + virtual void DeleteSessionCookiesAsync(const DeleteCallback&) override; - virtual CookieMonster* GetCookieMonster() OVERRIDE; + virtual CookieMonster* GetCookieMonster() override; // Enables writing session cookies into the cookie database. If this this // method is called, it must be called before first use of the instance diff --git a/net/cookies/cookie_monster_store_test.h b/net/cookies/cookie_monster_store_test.h index efbcbe5..c3a2827 100644 --- a/net/cookies/cookie_monster_store_test.h +++ b/net/cookies/cookie_monster_store_test.h @@ -82,22 +82,22 @@ class MockPersistentCookieStore return commands_; } - virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE; + virtual void Load(const LoadedCallback& loaded_callback) override; virtual void LoadCookiesForKey(const std::string& key, - const LoadedCallback& loaded_callback) OVERRIDE; + const LoadedCallback& loaded_callback) override; - virtual void AddCookie(const CanonicalCookie& cookie) OVERRIDE; + virtual void AddCookie(const CanonicalCookie& cookie) override; virtual void UpdateCookieAccessTime( - const CanonicalCookie& cookie) OVERRIDE; + const CanonicalCookie& cookie) override; virtual void DeleteCookie( - const CanonicalCookie& cookie) OVERRIDE; + const CanonicalCookie& cookie) override; - virtual void Flush(const base::Closure& callback) OVERRIDE; + virtual void Flush(const base::Closure& callback) override; - virtual void SetForceKeepSessionState() OVERRIDE; + virtual void SetForceKeepSessionState() override; protected: virtual ~MockPersistentCookieStore(); @@ -130,9 +130,9 @@ class MockCookieMonsterDelegate : public CookieMonsterDelegate { virtual void OnCookieChanged( const CanonicalCookie& cookie, bool removed, - CookieMonsterDelegate::ChangeCause cause) OVERRIDE; + CookieMonsterDelegate::ChangeCause cause) override; - virtual void OnLoaded() OVERRIDE; + virtual void OnLoaded() override; private: virtual ~MockCookieMonsterDelegate(); @@ -161,20 +161,20 @@ class MockSimplePersistentCookieStore public: MockSimplePersistentCookieStore(); - virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE; + virtual void Load(const LoadedCallback& loaded_callback) override; virtual void LoadCookiesForKey(const std::string& key, - const LoadedCallback& loaded_callback) OVERRIDE; + const LoadedCallback& loaded_callback) override; - virtual void AddCookie(const CanonicalCookie& cookie) OVERRIDE; + virtual void AddCookie(const CanonicalCookie& cookie) override; - virtual void UpdateCookieAccessTime(const CanonicalCookie& cookie) OVERRIDE; + virtual void UpdateCookieAccessTime(const CanonicalCookie& cookie) override; - virtual void DeleteCookie(const CanonicalCookie& cookie) OVERRIDE; + virtual void DeleteCookie(const CanonicalCookie& cookie) override; - virtual void Flush(const base::Closure& callback) OVERRIDE; + virtual void Flush(const base::Closure& callback) override; - virtual void SetForceKeepSessionState() OVERRIDE; + virtual void SetForceKeepSessionState() override; protected: virtual ~MockSimplePersistentCookieStore(); diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index 0610612..a328487 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc @@ -2165,7 +2165,7 @@ class FlushablePersistentStore : public CookieMonster::PersistentCookieStore { public: FlushablePersistentStore() : flush_count_(0) {} - virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE { + virtual void Load(const LoadedCallback& loaded_callback) override { std::vector<CanonicalCookie*> out_cookies; base::MessageLoop::current()->PostTask( FROM_HERE, @@ -2175,16 +2175,16 @@ class FlushablePersistentStore : public CookieMonster::PersistentCookieStore { virtual void LoadCookiesForKey( const std::string& key, - const LoadedCallback& loaded_callback) OVERRIDE { + const LoadedCallback& loaded_callback) override { Load(loaded_callback); } - virtual void AddCookie(const CanonicalCookie&) OVERRIDE {} - virtual void UpdateCookieAccessTime(const CanonicalCookie&) OVERRIDE {} - virtual void DeleteCookie(const CanonicalCookie&) OVERRIDE {} - virtual void SetForceKeepSessionState() OVERRIDE {} + virtual void AddCookie(const CanonicalCookie&) override {} + virtual void UpdateCookieAccessTime(const CanonicalCookie&) override {} + virtual void DeleteCookie(const CanonicalCookie&) override {} + virtual void SetForceKeepSessionState() override {} - virtual void Flush(const base::Closure& callback) OVERRIDE { + virtual void Flush(const base::Closure& callback) override { ++flush_count_; if (!callback.is_null()) callback.Run(); diff --git a/net/cookies/cookie_store_test_helpers.h b/net/cookies/cookie_store_test_helpers.h index 84b83bc..e4e7156 100644 --- a/net/cookies/cookie_store_test_helpers.h +++ b/net/cookies/cookie_store_test_helpers.h @@ -27,16 +27,16 @@ class DelayedCookieMonster : public CookieStore { const GURL& url, const std::string& cookie_line, const CookieOptions& options, - const CookieMonster::SetCookiesCallback& callback) OVERRIDE; + const CookieMonster::SetCookiesCallback& callback) override; virtual void GetCookiesWithOptionsAsync( const GURL& url, const CookieOptions& options, - const CookieMonster::GetCookiesCallback& callback) OVERRIDE; + const CookieMonster::GetCookiesCallback& callback) override; virtual void GetAllCookiesForURLAsync( const GURL& url, - const GetCookieListCallback& callback) OVERRIDE; + const GetCookieListCallback& callback) override; virtual bool SetCookieWithOptions(const GURL& url, const std::string& cookie_line, @@ -50,22 +50,22 @@ class DelayedCookieMonster : public CookieStore { virtual void DeleteCookieAsync(const GURL& url, const std::string& cookie_name, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void DeleteAllCreatedBetweenAsync( const base::Time& delete_begin, const base::Time& delete_end, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; virtual void DeleteAllCreatedBetweenForHostAsync( const base::Time delete_begin, const base::Time delete_end, const GURL& url, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; - virtual void DeleteSessionCookiesAsync(const DeleteCallback&) OVERRIDE; + virtual void DeleteSessionCookiesAsync(const DeleteCallback&) override; - virtual CookieMonster* GetCookieMonster() OVERRIDE; + virtual CookieMonster* GetCookieMonster() override; private: diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index 572691c..b3b80b4 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -1843,7 +1843,7 @@ class BadEntropyProvider : public base::FieldTrial::EntropyProvider { virtual ~BadEntropyProvider() {} virtual double GetEntropyForTrial(const std::string& trial_name, - uint32 randomization_seed) const OVERRIDE { + uint32 randomization_seed) const override { return 0.5; } }; diff --git a/net/disk_cache/blockfile/backend_impl.cc b/net/disk_cache/blockfile/backend_impl.cc index 4082743..bcac374 100644 --- a/net/disk_cache/blockfile/backend_impl.cc +++ b/net/disk_cache/blockfile/backend_impl.cc @@ -1260,7 +1260,7 @@ class BackendImpl::IteratorImpl : public Backend::Iterator { } virtual int OpenNextEntry(Entry** next_entry, - const net::CompletionCallback& callback) OVERRIDE { + const net::CompletionCallback& callback) override { if (!background_queue_) return net::ERR_FAILED; background_queue_->OpenNextEntry(iterator_.get(), next_entry, callback); diff --git a/net/disk_cache/blockfile/backend_impl.h b/net/disk_cache/blockfile/backend_impl.h index 1abc66d..e81b928 100644 --- a/net/disk_cache/blockfile/backend_impl.h +++ b/net/disk_cache/blockfile/backend_impl.h @@ -259,20 +259,20 @@ class NET_EXPORT_PRIVATE BackendImpl : public Backend { void FlushIndex(); // Backend implementation. - virtual net::CacheType GetCacheType() const OVERRIDE; - virtual int32 GetEntryCount() const OVERRIDE; + virtual net::CacheType GetCacheType() const override; + virtual int32 GetEntryCount() const override; virtual int OpenEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int CreateEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntry(const std::string& key, - const CompletionCallback& callback) OVERRIDE; - virtual int DoomAllEntries(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual int DoomAllEntries(const CompletionCallback& callback) override; virtual int DoomEntriesBetween(base::Time initial_time, base::Time end_time, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntriesSince(base::Time initial_time, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // NOTE: The blockfile Backend::Iterator::OpenNextEntry method does not modify // the last_used field of the entry, and therefore it does not impact the // eviction ranking of the entry. However, an enumeration will go through all @@ -281,9 +281,9 @@ class NET_EXPORT_PRIVATE BackendImpl : public Backend { // the iterator (for example, deleting the entry) will invalidate the // iterator. Performing operations on an entry that modify the entry may // result in loops in the iteration, skipped entries or similar. - virtual scoped_ptr<Iterator> CreateIterator() OVERRIDE; - virtual void GetStats(StatsItems* stats) OVERRIDE; - virtual void OnExternalCacheHit(const std::string& key) OVERRIDE; + virtual scoped_ptr<Iterator> CreateIterator() override; + virtual void GetStats(StatsItems* stats) override; + virtual void OnExternalCacheHit(const std::string& key) override; private: typedef base::hash_map<CacheAddr, EntryImpl*> EntriesMap; diff --git a/net/disk_cache/blockfile/backend_impl_v3.cc b/net/disk_cache/blockfile/backend_impl_v3.cc index b44b195..09794d3 100644 --- a/net/disk_cache/blockfile/backend_impl_v3.cc +++ b/net/disk_cache/blockfile/backend_impl_v3.cc @@ -667,7 +667,7 @@ class BackendImplV3::IteratorImpl : public Backend::Iterator { } virtual int OpenNextEntry(Entry** next_entry, - const net::CompletionCallback& callback) OVERRIDE { + const net::CompletionCallback& callback) override { if (!background_queue_) return net::ERR_FAILED; background_queue_->OpenNextEntry(&data_, next_entry, callback); @@ -1511,7 +1511,7 @@ int BackendImplV3::DoomEntriesSince(base::Time initial_time, class BackendImplV3::NotImplementedIterator : public Backend::Iterator { public: virtual int OpenNextEntry(disk_cache::Entry** next_entry, - const net::CompletionCallback& callback) OVERRIDE { + const net::CompletionCallback& callback) override { return net::ERR_NOT_IMPLEMENTED; } }; diff --git a/net/disk_cache/blockfile/backend_impl_v3.h b/net/disk_cache/blockfile/backend_impl_v3.h index ca64997..6f4f882 100644 --- a/net/disk_cache/blockfile/backend_impl_v3.h +++ b/net/disk_cache/blockfile/backend_impl_v3.h @@ -172,23 +172,23 @@ class NET_EXPORT_PRIVATE BackendImplV3 : public Backend { int SelfCheck(); // Backend implementation. - virtual net::CacheType GetCacheType() const OVERRIDE; - virtual int32 GetEntryCount() const OVERRIDE; + virtual net::CacheType GetCacheType() const override; + virtual int32 GetEntryCount() const override; virtual int OpenEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int CreateEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntry(const std::string& key, - const CompletionCallback& callback) OVERRIDE; - virtual int DoomAllEntries(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual int DoomAllEntries(const CompletionCallback& callback) override; virtual int DoomEntriesBetween(base::Time initial_time, base::Time end_time, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntriesSince(base::Time initial_time, - const CompletionCallback& callback) OVERRIDE; - virtual scoped_ptr<Iterator> CreateIterator() OVERRIDE; - virtual void GetStats(StatsItems* stats) OVERRIDE; - virtual void OnExternalCacheHit(const std::string& key) OVERRIDE; + const CompletionCallback& callback) override; + virtual scoped_ptr<Iterator> CreateIterator() override; + virtual void GetStats(StatsItems* stats) override; + virtual void OnExternalCacheHit(const std::string& key) override; private: friend class EvictionV3; diff --git a/net/disk_cache/blockfile/entry_impl.cc b/net/disk_cache/blockfile/entry_impl.cc index 3c3b218..2b98470 100644 --- a/net/disk_cache/blockfile/entry_impl.cc +++ b/net/disk_cache/blockfile/entry_impl.cc @@ -46,7 +46,7 @@ class SyncCallback: public disk_cache::FileIOCallback { } virtual ~SyncCallback() {} - virtual void OnFileIOComplete(int bytes_copied) OVERRIDE; + virtual void OnFileIOComplete(int bytes_copied) override; void Discard(); private: diff --git a/net/disk_cache/blockfile/entry_impl.h b/net/disk_cache/blockfile/entry_impl.h index c0b332b7..fea815dc 100644 --- a/net/disk_cache/blockfile/entry_impl.h +++ b/net/disk_cache/blockfile/entry_impl.h @@ -147,26 +147,26 @@ class NET_EXPORT_PRIVATE EntryImpl static int NumBlocksForEntry(int key_size); // Entry interface. - virtual void Doom() OVERRIDE; - virtual void Close() OVERRIDE; - virtual std::string GetKey() const OVERRIDE; - virtual base::Time GetLastUsed() const OVERRIDE; - virtual base::Time GetLastModified() const OVERRIDE; - virtual int32 GetDataSize(int index) const OVERRIDE; + virtual void Doom() override; + virtual void Close() override; + virtual std::string GetKey() const override; + virtual base::Time GetLastUsed() const override; + virtual base::Time GetLastModified() const override; + virtual int32 GetDataSize(int index) const override; virtual int ReadData(int index, int offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteData(int index, int offset, IOBuffer* buf, int buf_len, const CompletionCallback& callback, - bool truncate) OVERRIDE; + bool truncate) override; virtual int ReadSparseData(int64 offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteSparseData(int64 offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int GetAvailableRange(int64 offset, int len, int64* start, - const CompletionCallback& callback) OVERRIDE; - virtual bool CouldBeSparse() const OVERRIDE; - virtual void CancelSparseIO() OVERRIDE; - virtual int ReadyForSparseIO(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual bool CouldBeSparse() const override; + virtual void CancelSparseIO() override; + virtual int ReadyForSparseIO(const CompletionCallback& callback) override; private: enum { diff --git a/net/disk_cache/blockfile/entry_impl_v3.h b/net/disk_cache/blockfile/entry_impl_v3.h index 6be0c71..4215000 100644 --- a/net/disk_cache/blockfile/entry_impl_v3.h +++ b/net/disk_cache/blockfile/entry_impl_v3.h @@ -77,26 +77,26 @@ class NET_EXPORT_PRIVATE EntryImplV3 const net::BoundNetLog& net_log() const; // Entry interface. - virtual void Doom() OVERRIDE; - virtual void Close() OVERRIDE; - virtual std::string GetKey() const OVERRIDE; - virtual base::Time GetLastUsed() const OVERRIDE; - virtual base::Time GetLastModified() const OVERRIDE; - virtual int32 GetDataSize(int index) const OVERRIDE; + virtual void Doom() override; + virtual void Close() override; + virtual std::string GetKey() const override; + virtual base::Time GetLastUsed() const override; + virtual base::Time GetLastModified() const override; + virtual int32 GetDataSize(int index) const override; virtual int ReadData(int index, int offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteData(int index, int offset, IOBuffer* buf, int buf_len, const CompletionCallback& callback, - bool truncate) OVERRIDE; + bool truncate) override; virtual int ReadSparseData(int64 offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteSparseData(int64 offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int GetAvailableRange(int64 offset, int len, int64* start, - const CompletionCallback& callback) OVERRIDE; - virtual bool CouldBeSparse() const OVERRIDE; - virtual void CancelSparseIO() OVERRIDE; - virtual int ReadyForSparseIO(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual bool CouldBeSparse() const override; + virtual void CancelSparseIO() override; + virtual int ReadyForSparseIO(const CompletionCallback& callback) override; private: enum { diff --git a/net/disk_cache/blockfile/file_ios.cc b/net/disk_cache/blockfile/file_ios.cc index 4659e75..ef0e2fa 100644 --- a/net/disk_cache/blockfile/file_ios.cc +++ b/net/disk_cache/blockfile/file_ios.cc @@ -80,7 +80,7 @@ class FileInFlightIO : public disk_cache::InFlightIO { // queued (because we are inside WaitForPendingIO), and false if said task is // the one performing the call. virtual void OnOperationComplete(disk_cache::BackgroundIO* operation, - bool cancel) OVERRIDE; + bool cancel) override; private: DISALLOW_COPY_AND_ASSIGN(FileInFlightIO); diff --git a/net/disk_cache/blockfile/in_flight_backend_io.h b/net/disk_cache/blockfile/in_flight_backend_io.h index 5d8e435..4b10405 100644 --- a/net/disk_cache/blockfile/in_flight_backend_io.h +++ b/net/disk_cache/blockfile/in_flight_backend_io.h @@ -205,7 +205,7 @@ class InFlightBackendIO : public InFlightIO { protected: virtual void OnOperationComplete(BackgroundIO* operation, - bool cancel) OVERRIDE; + bool cancel) override; private: void PostOperation(BackendIO* operation); diff --git a/net/disk_cache/blockfile/index_table_v3_unittest.cc b/net/disk_cache/blockfile/index_table_v3_unittest.cc index b7a93a2..7f68ee3 100644 --- a/net/disk_cache/blockfile/index_table_v3_unittest.cc +++ b/net/disk_cache/blockfile/index_table_v3_unittest.cc @@ -35,12 +35,12 @@ class MockIndexBackend : public disk_cache::IndexTableBackend { bool grow_called() const { return grow_called_; } int buffer_len() const { return buffer_len_; } - virtual void GrowIndex() OVERRIDE { grow_called_ = true; } - virtual void SaveIndex(net::IOBuffer* buffer, int buffer_len) OVERRIDE { + virtual void GrowIndex() override { grow_called_ = true; } + virtual void SaveIndex(net::IOBuffer* buffer, int buffer_len) override { buffer_len_ = buffer_len; } - virtual void DeleteCell(EntryCell cell) OVERRIDE {} - virtual void FixCell(EntryCell cell) OVERRIDE {} + virtual void DeleteCell(EntryCell cell) override {} + virtual void FixCell(EntryCell cell) override {} private: bool grow_called_; diff --git a/net/disk_cache/blockfile/mapped_file_unittest.cc b/net/disk_cache/blockfile/mapped_file_unittest.cc index 8b3a1d0..8093e9a1 100644 --- a/net/disk_cache/blockfile/mapped_file_unittest.cc +++ b/net/disk_cache/blockfile/mapped_file_unittest.cc @@ -23,7 +23,7 @@ class FileCallbackTest: public disk_cache::FileIOCallback { } virtual ~FileCallbackTest() {} - virtual void OnFileIOComplete(int bytes_copied) OVERRIDE; + virtual void OnFileIOComplete(int bytes_copied) override; private: int id_; @@ -48,9 +48,9 @@ class TestFileBlock : public disk_cache::FileBlock { virtual ~TestFileBlock() {} // FileBlock interface. - virtual void* buffer() const OVERRIDE { return const_cast<char*>(buffer_); } - virtual size_t size() const OVERRIDE { return sizeof(buffer_); } - virtual int offset() const OVERRIDE { return 1024; } + virtual void* buffer() const override { return const_cast<char*>(buffer_); } + virtual size_t size() const override { return sizeof(buffer_); } + virtual int offset() const override { return 1024; } private: char buffer_[20]; diff --git a/net/disk_cache/blockfile/sparse_control.cc b/net/disk_cache/blockfile/sparse_control.cc index e251d84..ddb57b6 100644 --- a/net/disk_cache/blockfile/sparse_control.cc +++ b/net/disk_cache/blockfile/sparse_control.cc @@ -56,7 +56,7 @@ class ChildrenDeleter ChildrenDeleter(disk_cache::BackendImpl* backend, const std::string& name) : backend_(backend->GetWeakPtr()), name_(name), signature_(0) {} - virtual void OnFileIOComplete(int bytes_copied) OVERRIDE; + virtual void OnFileIOComplete(int bytes_copied) override; // Two ways of deleting the children: if we have the children map, use Start() // directly, otherwise pass the data address to ReadData(). diff --git a/net/disk_cache/blockfile/sparse_control_v3.cc b/net/disk_cache/blockfile/sparse_control_v3.cc index 66a60a2..cba0ed5 100644 --- a/net/disk_cache/blockfile/sparse_control_v3.cc +++ b/net/disk_cache/blockfile/sparse_control_v3.cc @@ -56,7 +56,7 @@ class ChildrenDeleter ChildrenDeleter(disk_cache::BackendImpl* backend, const std::string& name) : backend_(backend->GetWeakPtr()), name_(name), signature_(0) {} - virtual void OnFileIOComplete(int bytes_copied) OVERRIDE; + virtual void OnFileIOComplete(int bytes_copied) override; // Two ways of deleting the children: if we have the children map, use Start() // directly, otherwise pass the data address to ReadData(). diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h index 225d37f..ce36f92 100644 --- a/net/disk_cache/disk_cache_test_base.h +++ b/net/disk_cache/disk_cache_test_base.h @@ -46,7 +46,7 @@ class DiskCacheTest : public PlatformTest { // Deletes the contents of |cache_path_|. bool CleanupCacheDir(); - virtual void TearDown() OVERRIDE; + virtual void TearDown() override; base::FilePath cache_path_; @@ -154,7 +154,7 @@ class DiskCacheTestWithCache : public DiskCacheTest { void AddDelay(); // DiskCacheTest: - virtual void TearDown() OVERRIDE; + virtual void TearDown() override; // cache_ will always have a valid object, regardless of how the cache was // initialized. The implementation pointers can be NULL. diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index afe93ac..a3a7747 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc @@ -2063,7 +2063,7 @@ class SparseTestCompletionCallback: public net::TestCompletionCallback { } private: - virtual void SetResult(int result) OVERRIDE { + virtual void SetResult(int result) override { cache_.reset(); TestCompletionCallback::SetResult(result); } diff --git a/net/disk_cache/memory/mem_backend_impl.cc b/net/disk_cache/memory/mem_backend_impl.cc index 848ef98..3a90075 100644 --- a/net/disk_cache/memory/mem_backend_impl.cc +++ b/net/disk_cache/memory/mem_backend_impl.cc @@ -188,7 +188,7 @@ class MemBackendImpl::MemIterator : public Backend::Iterator { } virtual int OpenNextEntry(Entry** next_entry, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { if (!backend_) return net::ERR_FAILED; diff --git a/net/disk_cache/memory/mem_backend_impl.h b/net/disk_cache/memory/mem_backend_impl.h index 10946c5..46505ea 100644 --- a/net/disk_cache/memory/mem_backend_impl.h +++ b/net/disk_cache/memory/mem_backend_impl.h @@ -63,24 +63,24 @@ class NET_EXPORT_PRIVATE MemBackendImpl : public Backend { void RemoveFromRankingList(MemEntryImpl* entry); // Backend interface. - virtual net::CacheType GetCacheType() const OVERRIDE; - virtual int32 GetEntryCount() const OVERRIDE; + virtual net::CacheType GetCacheType() const override; + virtual int32 GetEntryCount() const override; virtual int OpenEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int CreateEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntry(const std::string& key, - const CompletionCallback& callback) OVERRIDE; - virtual int DoomAllEntries(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual int DoomAllEntries(const CompletionCallback& callback) override; virtual int DoomEntriesBetween(base::Time initial_time, base::Time end_time, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntriesSince(base::Time initial_time, - const CompletionCallback& callback) OVERRIDE; - virtual scoped_ptr<Iterator> CreateIterator() OVERRIDE; + const CompletionCallback& callback) override; + virtual scoped_ptr<Iterator> CreateIterator() override; virtual void GetStats( - std::vector<std::pair<std::string, std::string> >* stats) OVERRIDE {} - virtual void OnExternalCacheHit(const std::string& key) OVERRIDE; + std::vector<std::pair<std::string, std::string> >* stats) override {} + virtual void OnExternalCacheHit(const std::string& key) override; private: class MemIterator; diff --git a/net/disk_cache/memory/mem_entry_impl.h b/net/disk_cache/memory/mem_entry_impl.h index aec8d22..d31e14a 100644 --- a/net/disk_cache/memory/mem_entry_impl.h +++ b/net/disk_cache/memory/mem_entry_impl.h @@ -87,26 +87,26 @@ class MemEntryImpl : public Entry { } // Entry interface. - virtual void Doom() OVERRIDE; - virtual void Close() OVERRIDE; - virtual std::string GetKey() const OVERRIDE; - virtual base::Time GetLastUsed() const OVERRIDE; - virtual base::Time GetLastModified() const OVERRIDE; - virtual int32 GetDataSize(int index) const OVERRIDE; + virtual void Doom() override; + virtual void Close() override; + virtual std::string GetKey() const override; + virtual base::Time GetLastUsed() const override; + virtual base::Time GetLastModified() const override; + virtual int32 GetDataSize(int index) const override; virtual int ReadData(int index, int offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteData(int index, int offset, IOBuffer* buf, int buf_len, const CompletionCallback& callback, - bool truncate) OVERRIDE; + bool truncate) override; virtual int ReadSparseData(int64 offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteSparseData(int64 offset, IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int GetAvailableRange(int64 offset, int len, int64* start, - const CompletionCallback& callback) OVERRIDE; - virtual bool CouldBeSparse() const OVERRIDE; - virtual void CancelSparseIO() OVERRIDE {} - virtual int ReadyForSparseIO(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual bool CouldBeSparse() const override; + virtual void CancelSparseIO() override {} + virtual int ReadyForSparseIO(const CompletionCallback& callback) override; private: typedef base::hash_map<int, MemEntryImpl*> EntryMap; diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc index b0cbd52..32b074a 100644 --- a/net/disk_cache/simple/simple_backend_impl.cc +++ b/net/disk_cache/simple/simple_backend_impl.cc @@ -467,7 +467,7 @@ int SimpleBackendImpl::DoomEntriesSince( return DoomEntriesBetween(initial_time, Time(), callback); } -class SimpleBackendImpl::SimpleIterator FINAL : public Iterator { +class SimpleBackendImpl::SimpleIterator final : public Iterator { public: explicit SimpleIterator(base::WeakPtr<SimpleBackendImpl> backend) : backend_(backend), @@ -476,7 +476,7 @@ class SimpleBackendImpl::SimpleIterator FINAL : public Iterator { // From Backend::Iterator: virtual int OpenNextEntry(Entry** next_entry, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { CompletionCallback open_next_entry_impl = base::Bind(&SimpleIterator::OpenNextEntryImpl, weak_factory_.GetWeakPtr(), next_entry, callback); diff --git a/net/disk_cache/simple/simple_backend_impl.h b/net/disk_cache/simple/simple_backend_impl.h index 48c422f..e5a50da 100644 --- a/net/disk_cache/simple/simple_backend_impl.h +++ b/net/disk_cache/simple/simple_backend_impl.h @@ -85,27 +85,27 @@ class NET_EXPORT_PRIVATE SimpleBackendImpl : public Backend, // SimpleIndexDelegate: virtual void DoomEntries(std::vector<uint64>* entry_hashes, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // Backend: - virtual net::CacheType GetCacheType() const OVERRIDE; - virtual int32 GetEntryCount() const OVERRIDE; + virtual net::CacheType GetCacheType() const override; + virtual int32 GetEntryCount() const override; virtual int OpenEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int CreateEntry(const std::string& key, Entry** entry, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntry(const std::string& key, - const CompletionCallback& callback) OVERRIDE; - virtual int DoomAllEntries(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual int DoomAllEntries(const CompletionCallback& callback) override; virtual int DoomEntriesBetween(base::Time initial_time, base::Time end_time, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int DoomEntriesSince(base::Time initial_time, - const CompletionCallback& callback) OVERRIDE; - virtual scoped_ptr<Iterator> CreateIterator() OVERRIDE; + const CompletionCallback& callback) override; + virtual scoped_ptr<Iterator> CreateIterator() override; virtual void GetStats( - std::vector<std::pair<std::string, std::string> >* stats) OVERRIDE; - virtual void OnExternalCacheHit(const std::string& key) OVERRIDE; + std::vector<std::pair<std::string, std::string> >* stats) override; + virtual void OnExternalCacheHit(const std::string& key) override; private: class SimpleIterator; diff --git a/net/disk_cache/simple/simple_entry_impl.h b/net/disk_cache/simple/simple_entry_impl.h index 2dfb757..7c11b96 100644 --- a/net/disk_cache/simple/simple_entry_impl.h +++ b/net/disk_cache/simple/simple_entry_impl.h @@ -80,38 +80,38 @@ class NET_EXPORT_PRIVATE SimpleEntryImpl : public Entry, void SetKey(const std::string& key); // From Entry: - virtual void Doom() OVERRIDE; - virtual void Close() OVERRIDE; - virtual std::string GetKey() const OVERRIDE; - virtual base::Time GetLastUsed() const OVERRIDE; - virtual base::Time GetLastModified() const OVERRIDE; - virtual int32 GetDataSize(int index) const OVERRIDE; + virtual void Doom() override; + virtual void Close() override; + virtual std::string GetKey() const override; + virtual base::Time GetLastUsed() const override; + virtual base::Time GetLastModified() const override; + virtual int32 GetDataSize(int index) const override; virtual int ReadData(int stream_index, int offset, net::IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteData(int stream_index, int offset, net::IOBuffer* buf, int buf_len, const CompletionCallback& callback, - bool truncate) OVERRIDE; + bool truncate) override; virtual int ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteSparseData(int64 offset, net::IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int GetAvailableRange(int64 offset, int len, int64* start, - const CompletionCallback& callback) OVERRIDE; - virtual bool CouldBeSparse() const OVERRIDE; - virtual void CancelSparseIO() OVERRIDE; - virtual int ReadyForSparseIO(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual bool CouldBeSparse() const override; + virtual void CancelSparseIO() override; + virtual int ReadyForSparseIO(const CompletionCallback& callback) override; private: class ScopedOperationRunner; diff --git a/net/disk_cache/simple/simple_index_unittest.cc b/net/disk_cache/simple/simple_index_unittest.cc index 0afbaa2..0bb10d3 100644 --- a/net/disk_cache/simple/simple_index_unittest.cc +++ b/net/disk_cache/simple/simple_index_unittest.cc @@ -60,7 +60,7 @@ class MockSimpleIndexFile : public SimpleIndexFile, virtual void LoadIndexEntries( base::Time cache_last_modified, const base::Closure& callback, - SimpleIndexLoadResult* out_load_result) OVERRIDE { + SimpleIndexLoadResult* out_load_result) override { load_callback_ = callback; load_result_ = out_load_result; ++load_index_entries_calls_; @@ -69,7 +69,7 @@ class MockSimpleIndexFile : public SimpleIndexFile, virtual void WriteToDisk(const SimpleIndex::EntrySet& entry_set, uint64 cache_size, const base::TimeTicks& start, - bool app_on_background) OVERRIDE { + bool app_on_background) override { disk_writes_++; disk_write_entry_set_ = entry_set; } @@ -102,7 +102,7 @@ class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate { base::StringPrintf("key%d", static_cast<int>(hash_index))); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { scoped_ptr<MockSimpleIndexFile> index_file(new MockSimpleIndexFile()); index_file_ = index_file->AsWeakPtr(); index_.reset(new SimpleIndex(NULL, this, net::DISK_CACHE, @@ -121,7 +121,7 @@ class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate { // From SimpleIndexDelegate: virtual void DoomEntries(std::vector<uint64>* entry_hashes, - const net::CompletionCallback& callback) OVERRIDE { + const net::CompletionCallback& callback) override { std::for_each(entry_hashes->begin(), entry_hashes->end(), std::bind1st(std::mem_fun(&SimpleIndex::Remove), index_.get())); diff --git a/net/dns/address_sorter_posix.h b/net/dns/address_sorter_posix.h index 1c88ad2..ce3ffdb 100644 --- a/net/dns/address_sorter_posix.h +++ b/net/dns/address_sorter_posix.h @@ -65,13 +65,13 @@ class NET_EXPORT_PRIVATE AddressSorterPosix // AddressSorter: virtual void Sort(const AddressList& list, - const CallbackType& callback) const OVERRIDE; + const CallbackType& callback) const override; private: friend class AddressSorterPosixTest; // NetworkChangeNotifier::IPAddressObserver: - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; // Fills |info| with values for |address| from policy tables. void FillPolicy(const IPAddressNumber& address, diff --git a/net/dns/address_sorter_posix_unittest.cc b/net/dns/address_sorter_posix_unittest.cc index dea7ade..9039850 100644 --- a/net/dns/address_sorter_posix_unittest.cc +++ b/net/dns/address_sorter_posix_unittest.cc @@ -35,34 +35,34 @@ class TestUDPClientSocket : public DatagramClientSocket { virtual ~TestUDPClientSocket() {} - virtual int Read(IOBuffer*, int, const CompletionCallback&) OVERRIDE { + virtual int Read(IOBuffer*, int, const CompletionCallback&) override { NOTIMPLEMENTED(); return OK; } - virtual int Write(IOBuffer*, int, const CompletionCallback&) OVERRIDE { + virtual int Write(IOBuffer*, int, const CompletionCallback&) override { NOTIMPLEMENTED(); return OK; } - virtual int SetReceiveBufferSize(int32) OVERRIDE { + virtual int SetReceiveBufferSize(int32) override { return OK; } - virtual int SetSendBufferSize(int32) OVERRIDE { + virtual int SetSendBufferSize(int32) override { return OK; } - virtual void Close() OVERRIDE {} - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual void Close() override {} + virtual int GetPeerAddress(IPEndPoint* address) const override { NOTIMPLEMENTED(); return OK; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { if (!connected_) return ERR_UNEXPECTED; *address = local_endpoint_; return OK; } - virtual int Connect(const IPEndPoint& remote) OVERRIDE { + virtual int Connect(const IPEndPoint& remote) override { if (connected_) return ERR_UNEXPECTED; AddressMapping::const_iterator it = mapping_->find(remote.address()); @@ -73,7 +73,7 @@ class TestUDPClientSocket : public DatagramClientSocket { return OK; } - virtual const BoundNetLog& NetLog() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return net_log_; } @@ -96,13 +96,13 @@ class TestSocketFactory : public ClientSocketFactory { DatagramSocket::BindType, const RandIntCallback&, NetLog*, - const NetLog::Source&) OVERRIDE { + const NetLog::Source&) override { return scoped_ptr<DatagramClientSocket>(new TestUDPClientSocket(&mapping_)); } virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList&, NetLog*, - const NetLog::Source&) OVERRIDE { + const NetLog::Source&) override { NOTIMPLEMENTED(); return scoped_ptr<StreamSocket>(); } @@ -110,11 +110,11 @@ class TestSocketFactory : public ClientSocketFactory { scoped_ptr<ClientSocketHandle>, const HostPortPair&, const SSLConfig&, - const SSLClientSocketContext&) OVERRIDE { + const SSLClientSocketContext&) override { NOTIMPLEMENTED(); return scoped_ptr<SSLClientSocket>(); } - virtual void ClearSSLSessionCache() OVERRIDE { + virtual void ClearSSLSessionCache() override { NOTIMPLEMENTED(); } diff --git a/net/dns/address_sorter_win.cc b/net/dns/address_sorter_win.cc index 813bd93..079ba6a 100644 --- a/net/dns/address_sorter_win.cc +++ b/net/dns/address_sorter_win.cc @@ -31,7 +31,7 @@ class AddressSorterWin : public AddressSorter { // AddressSorter: virtual void Sort(const AddressList& list, - const CallbackType& callback) const OVERRIDE { + const CallbackType& callback) const override { DCHECK(!list.empty()); scoped_refptr<Job> job = new Job(list, callback); } @@ -160,7 +160,7 @@ class AddressSorterWinXP : public AddressSorter { // AddressSorter: virtual void Sort(const AddressList& list, - const CallbackType& callback) const OVERRIDE { + const CallbackType& callback) const override { AddressList list_ipv4; AddressList list_ipv6; for (size_t i = 0; i < list.size(); ++i) { diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc index 9e29ca4..de96c02 100644 --- a/net/dns/dns_client.cc +++ b/net/dns/dns_client.cc @@ -24,7 +24,7 @@ class DnsClientImpl : public DnsClient { : address_sorter_(AddressSorter::CreateAddressSorter()), net_log_(net_log) {} - virtual void SetConfig(const DnsConfig& config) OVERRIDE { + virtual void SetConfig(const DnsConfig& config) override { factory_.reset(); session_ = NULL; if (config.IsValid() && !config.unhandled_options) { @@ -40,15 +40,15 @@ class DnsClientImpl : public DnsClient { } } - virtual const DnsConfig* GetConfig() const OVERRIDE { + virtual const DnsConfig* GetConfig() const override { return session_.get() ? &session_->config() : NULL; } - virtual DnsTransactionFactory* GetTransactionFactory() OVERRIDE { + virtual DnsTransactionFactory* GetTransactionFactory() override { return session_.get() ? factory_.get() : NULL; } - virtual AddressSorter* GetAddressSorter() OVERRIDE { + virtual AddressSorter* GetAddressSorter() override { return address_sorter_.get(); } diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index 2c298dd..c0664eb 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -74,7 +74,7 @@ class DnsConfigWatcher : public NetworkChangeNotifier::NetworkChangeObserver { } virtual void OnNetworkChanged(NetworkChangeNotifier::ConnectionType type) - OVERRIDE { + override { if (!callback_.is_null() && type != NetworkChangeNotifier::CONNECTION_NONE) callback_.Run(true); } @@ -263,7 +263,7 @@ class DnsConfigServicePosix::ConfigReader : public SerialWorker { explicit ConfigReader(DnsConfigServicePosix* service) : service_(service), success_(false) {} - virtual void DoWork() OVERRIDE { + virtual void DoWork() override { base::TimeTicks start_time = base::TimeTicks::Now(); ConfigParsePosixResult result = ReadDnsConfig(&dns_config_); switch (result) { @@ -285,7 +285,7 @@ class DnsConfigServicePosix::ConfigReader : public SerialWorker { base::TimeTicks::Now() - start_time); } - virtual void OnWorkFinished() OVERRIDE { + virtual void OnWorkFinished() override { DCHECK(!IsCancelled()); if (success_) { service_->OnConfigRead(dns_config_); @@ -314,7 +314,7 @@ class DnsConfigServicePosix::HostsReader : public SerialWorker { private: virtual ~HostsReader() {} - virtual void DoWork() OVERRIDE { + virtual void DoWork() override { base::TimeTicks start_time = base::TimeTicks::Now(); success_ = ParseHostsFile(path_, &hosts_); UMA_HISTOGRAM_BOOLEAN("AsyncDNS.HostParseResult", success_); @@ -322,7 +322,7 @@ class DnsConfigServicePosix::HostsReader : public SerialWorker { base::TimeTicks::Now() - start_time); } - virtual void OnWorkFinished() OVERRIDE { + virtual void OnWorkFinished() override { if (success_) { service_->OnHostsRead(hosts_); } else { diff --git a/net/dns/dns_config_service_posix.h b/net/dns/dns_config_service_posix.h index ef28154..598d6ad 100644 --- a/net/dns/dns_config_service_posix.h +++ b/net/dns/dns_config_service_posix.h @@ -27,8 +27,8 @@ class NET_EXPORT_PRIVATE DnsConfigServicePosix : public DnsConfigService { protected: // DnsConfigService: - virtual void ReadNow() OVERRIDE; - virtual bool StartWatching() OVERRIDE; + virtual void ReadNow() override; + virtual bool StartWatching() override; private: class Watcher; diff --git a/net/dns/dns_config_service_unittest.cc b/net/dns/dns_config_service_unittest.cc index e71baef..0239f80 100644 --- a/net/dns/dns_config_service_unittest.cc +++ b/net/dns/dns_config_service_unittest.cc @@ -121,8 +121,8 @@ class DnsConfigServiceTest : public testing::Test { protected: class TestDnsConfigService : public DnsConfigService { public: - virtual void ReadNow() OVERRIDE {} - virtual bool StartWatching() OVERRIDE { return true; } + virtual void ReadNow() override {} + virtual bool StartWatching() override { return true; } // Expose the protected methods to this test suite. void InvalidateConfig() { @@ -176,7 +176,7 @@ class DnsConfigServiceTest : public testing::Test { return hosts; } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { quit_on_config_ = false; service_.reset(new TestDnsConfigService()); diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index ec7e6f2..dd3ee3d 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -312,7 +312,7 @@ class RegistryWatcher : public base::win::ObjectWatcher::Delegate, return true; } - virtual void OnObjectSignaled(HANDLE object) OVERRIDE { + virtual void OnObjectSignaled(HANDLE object) override { // TODO(vadimt): Remove ScopedProfile below once crbug.com/418183 is fixed. tracked_objects::ScopedProfile tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( @@ -609,7 +609,7 @@ class DnsConfigServiceWin::Watcher } // NetworkChangeNotifier::IPAddressObserver: - virtual void OnIPAddressChanged() OVERRIDE { + virtual void OnIPAddressChanged() override { // Need to update non-loopback IP of local host. service_->OnHostsChanged(true); } @@ -635,7 +635,7 @@ class DnsConfigServiceWin::ConfigReader : public SerialWorker { private: virtual ~ConfigReader() {} - virtual void DoWork() OVERRIDE { + virtual void DoWork() override { // Should be called on WorkerPool. base::TimeTicks start_time = base::TimeTicks::Now(); DnsSystemSettings settings = {}; @@ -651,7 +651,7 @@ class DnsConfigServiceWin::ConfigReader : public SerialWorker { base::TimeTicks::Now() - start_time); } - virtual void OnWorkFinished() OVERRIDE { + virtual void OnWorkFinished() override { DCHECK(loop()->BelongsToCurrentThread()); DCHECK(!IsCancelled()); if (success_) { @@ -685,7 +685,7 @@ class DnsConfigServiceWin::HostsReader : public SerialWorker { private: virtual ~HostsReader() {} - virtual void DoWork() OVERRIDE { + virtual void DoWork() override { base::TimeTicks start_time = base::TimeTicks::Now(); HostsParseWinResult result = HOSTS_PARSE_WIN_UNREADABLE_HOSTS_FILE; if (ParseHostsFile(path_, &hosts_)) @@ -698,7 +698,7 @@ class DnsConfigServiceWin::HostsReader : public SerialWorker { base::TimeTicks::Now() - start_time); } - virtual void OnWorkFinished() OVERRIDE { + virtual void OnWorkFinished() override { DCHECK(loop()->BelongsToCurrentThread()); if (success_) { service_->OnHostsRead(hosts_); diff --git a/net/dns/dns_config_service_win.h b/net/dns/dns_config_service_win.h index d26aed5..c28d863 100644 --- a/net/dns/dns_config_service_win.h +++ b/net/dns/dns_config_service_win.h @@ -125,8 +125,8 @@ class NET_EXPORT_PRIVATE DnsConfigServiceWin : public DnsConfigService { class HostsReader; // DnsConfigService: - virtual void ReadNow() OVERRIDE; - virtual bool StartWatching() OVERRIDE; + virtual void ReadNow() override; + virtual bool StartWatching() override; void OnConfigChanged(bool succeeded); void OnHostsChanged(bool succeeded); diff --git a/net/dns/dns_session_unittest.cc b/net/dns/dns_session_unittest.cc index ed726f2..e6f1230 100644 --- a/net/dns/dns_session_unittest.cc +++ b/net/dns/dns_session_unittest.cc @@ -30,11 +30,11 @@ class TestClientSocketFactory : public ClientSocketFactory { DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, net::NetLog* net_log, - const net::NetLog::Source& source) OVERRIDE; + const net::NetLog::Source& source) override; virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, - NetLog*, const NetLog::Source&) OVERRIDE { + NetLog*, const NetLog::Source&) override { NOTIMPLEMENTED(); return scoped_ptr<StreamSocket>(); } @@ -43,12 +43,12 @@ class TestClientSocketFactory : public ClientSocketFactory { scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE { + const SSLClientSocketContext& context) override { NOTIMPLEMENTED(); return scoped_ptr<SSLClientSocket>(); } - virtual void ClearSSLSessionCache() OVERRIDE { + virtual void ClearSSLSessionCache() override { NOTIMPLEMENTED(); } @@ -92,19 +92,19 @@ class MockDnsSocketPool : public DnsSocketPool { virtual void Initialize( const std::vector<IPEndPoint>* nameservers, - NetLog* net_log) OVERRIDE { + NetLog* net_log) override { InitializeInternal(nameservers, net_log); } virtual scoped_ptr<DatagramClientSocket> AllocateSocket( - unsigned server_index) OVERRIDE { + unsigned server_index) override { test_->OnSocketAllocated(server_index); return CreateConnectedSocket(server_index); } virtual void FreeSocket( unsigned server_index, - scoped_ptr<DatagramClientSocket> socket) OVERRIDE { + scoped_ptr<DatagramClientSocket> socket) override { test_->OnSocketFreed(server_index); } diff --git a/net/dns/dns_socket_pool.cc b/net/dns/dns_socket_pool.cc index b446fa0..09aca5a 100644 --- a/net/dns/dns_socket_pool.cc +++ b/net/dns/dns_socket_pool.cc @@ -97,18 +97,18 @@ class NullDnsSocketPool : public DnsSocketPool { virtual void Initialize( const std::vector<IPEndPoint>* nameservers, - NetLog* net_log) OVERRIDE { + NetLog* net_log) override { InitializeInternal(nameservers, net_log); } virtual scoped_ptr<DatagramClientSocket> AllocateSocket( - unsigned server_index) OVERRIDE { + unsigned server_index) override { return CreateConnectedSocket(server_index); } virtual void FreeSocket( unsigned server_index, - scoped_ptr<DatagramClientSocket> socket) OVERRIDE { + scoped_ptr<DatagramClientSocket> socket) override { } private: @@ -131,14 +131,14 @@ class DefaultDnsSocketPool : public DnsSocketPool { virtual void Initialize( const std::vector<IPEndPoint>* nameservers, - NetLog* net_log) OVERRIDE; + NetLog* net_log) override; virtual scoped_ptr<DatagramClientSocket> AllocateSocket( - unsigned server_index) OVERRIDE; + unsigned server_index) override; virtual void FreeSocket( unsigned server_index, - scoped_ptr<DatagramClientSocket> socket) OVERRIDE; + scoped_ptr<DatagramClientSocket> socket) override; private: void FillPool(unsigned server_index, unsigned size); diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc index 01acb34..6327ed2 100644 --- a/net/dns/dns_test_util.cc +++ b/net/dns/dns_test_util.cc @@ -27,7 +27,7 @@ class MockAddressSorter : public AddressSorter { public: virtual ~MockAddressSorter() {} virtual void Sort(const AddressList& list, - const CallbackType& callback) const OVERRIDE { + const CallbackType& callback) const override { // Do nothing. callback.Run(true, list); } @@ -60,15 +60,15 @@ class MockTransaction : public DnsTransaction, } } - virtual const std::string& GetHostname() const OVERRIDE { + virtual const std::string& GetHostname() const override { return hostname_; } - virtual uint16 GetType() const OVERRIDE { + virtual uint16 GetType() const override { return qtype_; } - virtual void Start() OVERRIDE { + virtual void Start() override { EXPECT_FALSE(started_); started_ = true; if (delayed_) @@ -172,7 +172,7 @@ class MockTransactionFactory : public DnsTransactionFactory { const std::string& hostname, uint16 qtype, const DnsTransactionFactory::CallbackType& callback, - const BoundNetLog&) OVERRIDE { + const BoundNetLog&) override { MockTransaction* transaction = new MockTransaction(rules_, hostname, qtype, callback); if (transaction->delayed()) diff --git a/net/dns/dns_test_util.h b/net/dns/dns_test_util.h index d0b8e81..5b363c7 100644 --- a/net/dns/dns_test_util.h +++ b/net/dns/dns_test_util.h @@ -211,10 +211,10 @@ class MockDnsClient : public DnsClient { virtual ~MockDnsClient(); // DnsClient interface: - virtual void SetConfig(const DnsConfig& config) OVERRIDE; - virtual const DnsConfig* GetConfig() const OVERRIDE; - virtual DnsTransactionFactory* GetTransactionFactory() OVERRIDE; - virtual AddressSorter* GetAddressSorter() OVERRIDE; + virtual void SetConfig(const DnsConfig& config) override; + virtual const DnsConfig* GetConfig() const override; + virtual DnsTransactionFactory* GetTransactionFactory() override; + virtual AddressSorter* GetAddressSorter() override; // Completes all DnsTransactions that were delayed by a rule. void CompleteDelayedTransactions(); diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index 0424d48..32b5602 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -141,7 +141,7 @@ class DnsUDPAttempt : public DnsAttempt { query_(query.Pass()) {} // DnsAttempt: - virtual int Start(const CompletionCallback& callback) OVERRIDE { + virtual int Start(const CompletionCallback& callback) override { DCHECK_EQ(STATE_NONE, next_state_); callback_ = callback; start_time_ = base::TimeTicks::Now(); @@ -149,16 +149,16 @@ class DnsUDPAttempt : public DnsAttempt { return DoLoop(OK); } - virtual const DnsQuery* GetQuery() const OVERRIDE { + virtual const DnsQuery* GetQuery() const override { return query_.get(); } - virtual const DnsResponse* GetResponse() const OVERRIDE { + virtual const DnsResponse* GetResponse() const override { const DnsResponse* resp = response_.get(); return (resp != NULL && resp->IsValid()) ? resp : NULL; } - virtual const BoundNetLog& GetSocketNetLog() const OVERRIDE { + virtual const BoundNetLog& GetSocketNetLog() const override { return socket_lease_->socket()->NetLog(); } @@ -306,7 +306,7 @@ class DnsTCPAttempt : public DnsAttempt { response_length_(0) {} // DnsAttempt: - virtual int Start(const CompletionCallback& callback) OVERRIDE { + virtual int Start(const CompletionCallback& callback) override { DCHECK_EQ(STATE_NONE, next_state_); callback_ = callback; start_time_ = base::TimeTicks::Now(); @@ -320,16 +320,16 @@ class DnsTCPAttempt : public DnsAttempt { return DoLoop(rv); } - virtual const DnsQuery* GetQuery() const OVERRIDE { + virtual const DnsQuery* GetQuery() const override { return query_.get(); } - virtual const DnsResponse* GetResponse() const OVERRIDE { + virtual const DnsResponse* GetResponse() const override { const DnsResponse* resp = response_.get(); return (resp != NULL && resp->IsValid()) ? resp : NULL; } - virtual const BoundNetLog& GetSocketNetLog() const OVERRIDE { + virtual const BoundNetLog& GetSocketNetLog() const override { return socket_->NetLog(); } @@ -574,17 +574,17 @@ class DnsTransactionImpl : public DnsTransaction, } // otherwise logged in DoCallback or Start } - virtual const std::string& GetHostname() const OVERRIDE { + virtual const std::string& GetHostname() const override { DCHECK(CalledOnValidThread()); return hostname_; } - virtual uint16 GetType() const OVERRIDE { + virtual uint16 GetType() const override { DCHECK(CalledOnValidThread()); return qtype_; } - virtual void Start() OVERRIDE { + virtual void Start() override { DCHECK(!callback_.is_null()); DCHECK(attempts_.empty()); net_log_.BeginEvent(NetLog::TYPE_DNS_TRANSACTION, @@ -972,7 +972,7 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory { const std::string& hostname, uint16 qtype, const CallbackType& callback, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { return scoped_ptr<DnsTransaction>(new DnsTransactionImpl( session_.get(), hostname, qtype, callback, net_log)); } diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index af073ac..908f915 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -153,7 +153,7 @@ class FailingUDPClientSocket : public MockUDPClientSocket { : MockUDPClientSocket(data, net_log) { } virtual ~FailingUDPClientSocket() {} - virtual int Connect(const IPEndPoint& endpoint) OVERRIDE { + virtual int Connect(const IPEndPoint& endpoint) override { return ERR_CONNECTION_REFUSED; } @@ -170,7 +170,7 @@ class TestUDPClientSocket : public MockUDPClientSocket { : MockUDPClientSocket(data, net_log), factory_(factory) { } virtual ~TestUDPClientSocket() {} - virtual int Connect(const IPEndPoint& endpoint) OVERRIDE; + virtual int Connect(const IPEndPoint& endpoint) override; private: TestSocketFactory* factory_; @@ -188,7 +188,7 @@ class TestSocketFactory : public MockClientSocketFactory { DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, net::NetLog* net_log, - const net::NetLog::Source& source) OVERRIDE { + const net::NetLog::Source& source) override { if (fail_next_socket_) { fail_next_socket_ = false; return scoped_ptr<DatagramClientSocket>( @@ -441,7 +441,7 @@ class DnsTransactionTest : public testing::Test { } } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // By default set one server, ConfigureNumServers(1); // and no retransmissions, @@ -451,7 +451,7 @@ class DnsTransactionTest : public testing::Test { ConfigureFactory(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Check that all socket data was at least written to. for (size_t i = 0; i < socket_data_.size(); ++i) { EXPECT_TRUE(socket_data_[i]->was_written()) << i; diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc index 201bba4..5632ef9 100644 --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc @@ -1424,7 +1424,7 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job, } // PriorityDispatch::Job: - virtual void Start() OVERRIDE { + virtual void Start() override { DCHECK_LE(num_occupied_job_slots_, 1u); handle_.Reset(); @@ -1590,7 +1590,7 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job, virtual void OnDnsTaskComplete(base::TimeTicks start_time, int net_error, const AddressList& addr_list, - base::TimeDelta ttl) OVERRIDE { + base::TimeDelta ttl) override { DCHECK(is_dns_running()); base::TimeDelta duration = base::TimeTicks::Now() - start_time; @@ -1625,7 +1625,7 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job, bounded_ttl); } - virtual void OnFirstDnsTransactionComplete() OVERRIDE { + virtual void OnFirstDnsTransactionComplete() override { DCHECK(dns_task_->needs_two_transactions()); DCHECK_EQ(dns_task_->needs_another_transaction(), is_queued()); // No longer need to occupy two dispatcher slots. diff --git a/net/dns/host_resolver_impl.h b/net/dns/host_resolver_impl.h index 7a0fb57..edd64fc 100644 --- a/net/dns/host_resolver_impl.h +++ b/net/dns/host_resolver_impl.h @@ -129,16 +129,16 @@ class NET_EXPORT HostResolverImpl AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& source_net_log) OVERRIDE; + const BoundNetLog& source_net_log) override; virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& source_net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle req) OVERRIDE; - virtual void SetDefaultAddressFamily(AddressFamily address_family) OVERRIDE; - virtual AddressFamily GetDefaultAddressFamily() const OVERRIDE; - virtual void SetDnsClientEnabled(bool enabled) OVERRIDE; - virtual HostCache* GetHostCache() OVERRIDE; - virtual base::Value* GetDnsConfigAsValue() const OVERRIDE; + const BoundNetLog& source_net_log) override; + virtual void CancelRequest(RequestHandle req) override; + virtual void SetDefaultAddressFamily(AddressFamily address_family) override; + virtual AddressFamily GetDefaultAddressFamily() const override; + virtual void SetDnsClientEnabled(bool enabled) override; + virtual HostCache* GetHostCache() override; + virtual base::Value* GetDnsConfigAsValue() const override; void set_proc_params_for_test(const ProcTaskParams& proc_params) { proc_params_ = proc_params; @@ -220,10 +220,10 @@ class NET_EXPORT HostResolverImpl void TryServingAllJobsFromHosts(); // NetworkChangeNotifier::IPAddressObserver: - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; // NetworkChangeNotifier::DNSObserver: - virtual void OnDNSChanged() OVERRIDE; + virtual void OnDNSChanged() override; // True if have a DnsClient with a valid DnsConfig. bool HaveDnsConfig() const; diff --git a/net/dns/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc index 89112de..dadc03d 100644 --- a/net/dns/host_resolver_impl_unittest.cc +++ b/net/dns/host_resolver_impl_unittest.cc @@ -129,7 +129,7 @@ class MockHostResolverProc : public HostResolverProc { AddressFamily address_family, HostResolverFlags host_resolver_flags, AddressList* addrlist, - int* os_error) OVERRIDE { + int* os_error) override { base::AutoLock lock(lock_); capture_list_.push_back(ResolveKey(hostname, address_family)); ++num_requests_waiting_; @@ -365,7 +365,7 @@ class LookupAttemptHostResolverProc : public HostResolverProc { AddressFamily address_family, HostResolverFlags host_resolver_flags, AddressList* addrlist, - int* os_error) OVERRIDE { + int* os_error) override { bool wait_for_right_attempt_to_complete = true; { base::AutoLock auto_lock(lock_); @@ -460,11 +460,11 @@ class HostResolverImplTest : public testing::Test { }; // testing::Test implementation: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { CreateResolver(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (resolver_.get()) EXPECT_EQ(0u, resolver_->num_running_dispatcher_jobs_for_tests()); EXPECT_FALSE(proc_->HasBlockedRequests()); @@ -732,7 +732,7 @@ TEST_F(HostResolverImplTest, CanceledRequestsReleaseJobSlots) { TEST_F(HostResolverImplTest, CancelWithinCallback) { struct MyHandler : public Handler { - virtual void Handle(Request* req) OVERRIDE { + virtual void Handle(Request* req) override { // Port 80 is the first request that the callback will be invoked for. // While we are executing within that callback, cancel the other requests // in the job and start another request. @@ -761,7 +761,7 @@ TEST_F(HostResolverImplTest, CancelWithinCallback) { TEST_F(HostResolverImplTest, DeleteWithinCallback) { struct MyHandler : public Handler { - virtual void Handle(Request* req) OVERRIDE { + virtual void Handle(Request* req) override { EXPECT_EQ("a", req->info().hostname()); EXPECT_EQ(80, req->info().port()); @@ -787,7 +787,7 @@ TEST_F(HostResolverImplTest, DeleteWithinCallback) { TEST_F(HostResolverImplTest, DeleteWithinAbortedCallback) { struct MyHandler : public Handler { - virtual void Handle(Request* req) OVERRIDE { + virtual void Handle(Request* req) override { EXPECT_EQ("a", req->info().hostname()); EXPECT_EQ(80, req->info().port()); @@ -827,7 +827,7 @@ TEST_F(HostResolverImplTest, DeleteWithinAbortedCallback) { TEST_F(HostResolverImplTest, StartWithinCallback) { struct MyHandler : public Handler { - virtual void Handle(Request* req) OVERRIDE { + virtual void Handle(Request* req) override { if (req->index() == 0) { // On completing the first request, start another request for "a". // Since caching is disabled, this will result in another async request. @@ -858,7 +858,7 @@ TEST_F(HostResolverImplTest, StartWithinCallback) { TEST_F(HostResolverImplTest, BypassCache) { struct MyHandler : public Handler { - virtual void Handle(Request* req) OVERRIDE { + virtual void Handle(Request* req) override { if (req->index() == 0) { // On completing the first request, start another request for "a". // Since caching is enabled, this should complete synchronously. @@ -956,7 +956,7 @@ TEST_F(HostResolverImplTest, ObeyPoolConstraintsAfterIPAddressChange) { // will not be aborted. TEST_F(HostResolverImplTest, AbortOnlyExistingRequestsOnIPAddressChange) { struct MyHandler : public Handler { - virtual void Handle(Request* req) OVERRIDE { + virtual void Handle(Request* req) override { // Start new request for a different hostname to ensure that the order // of jobs in HostResolverImpl is not stable. std::string hostname; @@ -1339,7 +1339,7 @@ class HostResolverImplDnsTest : public HostResolverImplTest { protected: // testing::Test implementation: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { AddDnsRule("nx", dns_protocol::kTypeA, MockDnsClientRule::FAIL, false); AddDnsRule("nx", dns_protocol::kTypeAAAA, MockDnsClientRule::FAIL, false); AddDnsRule("ok", dns_protocol::kTypeA, MockDnsClientRule::OK, false); @@ -1381,7 +1381,7 @@ class HostResolverImplDnsTest : public HostResolverImplTest { // HostResolverImplTest implementation: virtual void CreateResolverWithLimitsAndParams( size_t max_concurrent_resolves, - const HostResolverImpl::ProcTaskParams& params) OVERRIDE { + const HostResolverImpl::ProcTaskParams& params) override { HostResolverImpl::Options options = DefaultOptions(); options.max_concurrent_resolves = max_concurrent_resolves; resolver_.reset(new HostResolverImpl(options, NULL)); diff --git a/net/dns/host_resolver_proc.h b/net/dns/host_resolver_proc.h index 014a720..695e3bc 100644 --- a/net/dns/host_resolver_proc.h +++ b/net/dns/host_resolver_proc.h @@ -99,7 +99,7 @@ class NET_EXPORT_PRIVATE SystemHostResolverProc : public HostResolverProc { AddressFamily address_family, HostResolverFlags host_resolver_flags, AddressList* addr_list, - int* os_error) OVERRIDE; + int* os_error) override; protected: virtual ~SystemHostResolverProc(); diff --git a/net/dns/mapped_host_resolver.h b/net/dns/mapped_host_resolver.h index c03a2a6..6d4ab92 100644 --- a/net/dns/mapped_host_resolver.h +++ b/net/dns/mapped_host_resolver.h @@ -50,14 +50,14 @@ class NET_EXPORT MappedHostResolver : public HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle req) OVERRIDE; - virtual void SetDnsClientEnabled(bool enabled) OVERRIDE; - virtual HostCache* GetHostCache() OVERRIDE; - virtual base::Value* GetDnsConfigAsValue() const OVERRIDE; + const BoundNetLog& net_log) override; + virtual void CancelRequest(RequestHandle req) override; + virtual void SetDnsClientEnabled(bool enabled) override; + virtual HostCache* GetHostCache() override; + virtual base::Value* GetDnsConfigAsValue() const override; private: // Modify the request |info| according to |rules_|. Returns either OK or diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h index 6051511..b6f8b93 100644 --- a/net/dns/mdns_client_impl.h +++ b/net/dns/mdns_client_impl.h @@ -29,7 +29,7 @@ class MDnsSocketFactoryImpl : public MDnsSocketFactory { virtual ~MDnsSocketFactoryImpl() {}; virtual void CreateSockets( - ScopedVector<DatagramServerSocket>* sockets) OVERRIDE; + ScopedVector<DatagramServerSocket>* sockets) override; private: DISALLOW_COPY_AND_ASSIGN(MDnsSocketFactoryImpl); @@ -128,9 +128,9 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient { std::vector<const RecordParsed*>* records) const; // Parse the response and alert relevant listeners. - virtual void HandlePacket(DnsResponse* response, int bytes_read) OVERRIDE; + virtual void HandlePacket(DnsResponse* response, int bytes_read) override; - virtual void OnConnectionError(int error) OVERRIDE; + virtual void OnConnectionError(int error) override; private: typedef std::pair<std::string, uint16> ListenerKey; @@ -176,17 +176,17 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient { virtual scoped_ptr<MDnsListener> CreateListener( uint16 rrtype, const std::string& name, - MDnsListener::Delegate* delegate) OVERRIDE; + MDnsListener::Delegate* delegate) override; virtual scoped_ptr<MDnsTransaction> CreateTransaction( uint16 rrtype, const std::string& name, int flags, - const MDnsTransaction::ResultCallback& callback) OVERRIDE; + const MDnsTransaction::ResultCallback& callback) override; - virtual bool StartListening(MDnsSocketFactory* socket_factory) OVERRIDE; - virtual void StopListening() OVERRIDE; - virtual bool IsListening() const OVERRIDE; + virtual bool StartListening(MDnsSocketFactory* socket_factory) override; + virtual void StopListening() override; + virtual bool IsListening() const override; Core* core() { return core_.get(); } @@ -207,14 +207,14 @@ class MDnsListenerImpl : public MDnsListener, virtual ~MDnsListenerImpl(); // MDnsListener implementation: - virtual bool Start() OVERRIDE; + virtual bool Start() override; // Actively refresh any received records. - virtual void SetActiveRefresh(bool active_refresh) OVERRIDE; + virtual void SetActiveRefresh(bool active_refresh) override; - virtual const std::string& GetName() const OVERRIDE; + virtual const std::string& GetName() const override; - virtual uint16 GetType() const OVERRIDE; + virtual uint16 GetType() const override; MDnsListener::Delegate* delegate() { return delegate_; } @@ -255,17 +255,17 @@ class MDnsTransactionImpl : public base::SupportsWeakPtr<MDnsTransactionImpl>, virtual ~MDnsTransactionImpl(); // MDnsTransaction implementation: - virtual bool Start() OVERRIDE; + virtual bool Start() override; - virtual const std::string& GetName() const OVERRIDE; - virtual uint16 GetType() const OVERRIDE; + virtual const std::string& GetName() const override; + virtual uint16 GetType() const override; // MDnsListener::Delegate implementation: virtual void OnRecordUpdate(MDnsListener::UpdateType update, - const RecordParsed* record) OVERRIDE; - virtual void OnNsecRecord(const std::string& name, unsigned type) OVERRIDE; + const RecordParsed* record) override; + virtual void OnNsecRecord(const std::string& name, unsigned type) override; - virtual void OnCachePurged() OVERRIDE; + virtual void OnCachePurged() override; private: bool is_active() { return !callback_.is_null(); } diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc index a7a3c03..4b2e7d5 100644 --- a/net/dns/mdns_client_unittest.cc +++ b/net/dns/mdns_client_unittest.cc @@ -391,7 +391,7 @@ class PtrRecordCopyContainer { class MDnsTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; void DeleteTransaction(); void DeleteBothListeners(); void RunFor(base::TimeDelta time_period); @@ -1057,7 +1057,7 @@ TEST_F(MDnsTest, RefreshQuery) { class SimpleMockSocketFactory : public MDnsSocketFactory { public: virtual void CreateSockets( - ScopedVector<DatagramServerSocket>* sockets) OVERRIDE { + ScopedVector<DatagramServerSocket>* sockets) override { sockets->clear(); sockets->swap(sockets_); } @@ -1088,7 +1088,7 @@ class MDnsConnectionTest : public ::testing::Test { protected: // Follow successful connection initialization. - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { socket_ipv4_ = new MockMDnsDatagramServerSocket(ADDRESS_FAMILY_IPV4); socket_ipv6_ = new MockMDnsDatagramServerSocket(ADDRESS_FAMILY_IPV6); factory_.PushSocket(socket_ipv6_); @@ -1160,7 +1160,7 @@ TEST_F(MDnsConnectionTest, Error) { class MDnsConnectionSendTest : public MDnsConnectionTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { MDnsConnectionTest::SetUp(); EXPECT_CALL(*socket_ipv4_, RecvFrom(_, _, _, _)) .WillOnce(Return(ERR_IO_PENDING)); diff --git a/net/dns/mock_host_resolver.h b/net/dns/mock_host_resolver.h index 3593fbd..9d5339f 100644 --- a/net/dns/mock_host_resolver.h +++ b/net/dns/mock_host_resolver.h @@ -79,12 +79,12 @@ class MockHostResolverBase : public HostResolver, AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle req) OVERRIDE; - virtual HostCache* GetHostCache() OVERRIDE; + const BoundNetLog& net_log) override; + virtual void CancelRequest(RequestHandle req) override; + virtual HostCache* GetHostCache() override; // Resolves all pending requests. It is only valid to invoke this if // set_ondemand_mode was set before. The requests are resolved asynchronously, @@ -206,7 +206,7 @@ class RuleBasedHostResolverProc : public HostResolverProc { AddressFamily address_family, HostResolverFlags host_resolver_flags, AddressList* addrlist, - int* os_error) OVERRIDE; + int* os_error) override; private: struct Rule; @@ -228,11 +228,11 @@ class HangingHostResolver : public HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle req) OVERRIDE {} + const BoundNetLog& net_log) override; + virtual void CancelRequest(RequestHandle req) override {} }; // This class sets the default HostResolverProc for a particular scope. The diff --git a/net/dns/mock_mdns_socket_factory.h b/net/dns/mock_mdns_socket_factory.h index 1ecc4be..6278661 100644 --- a/net/dns/mock_mdns_socket_factory.h +++ b/net/dns/mock_mdns_socket_factory.h @@ -27,7 +27,7 @@ class MockMDnsDatagramServerSocket : public DatagramServerSocket { const CompletionCallback& callback)); virtual int SendTo(IOBuffer* buf, int buf_len, const IPEndPoint& address, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; MOCK_METHOD3(SendToInternal, int(const std::string& packet, const std::string address, @@ -39,7 +39,7 @@ class MockMDnsDatagramServerSocket : public DatagramServerSocket { MOCK_METHOD0(Close, void()); MOCK_CONST_METHOD1(GetPeerAddress, int(IPEndPoint* address)); - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + virtual int GetLocalAddress(IPEndPoint* address) const override; MOCK_CONST_METHOD0(NetLog, const BoundNetLog&()); MOCK_METHOD0(AllowAddressReuse, void()); @@ -75,7 +75,7 @@ class MockMDnsSocketFactory : public MDnsSocketFactory { virtual ~MockMDnsSocketFactory(); virtual void CreateSockets( - ScopedVector<DatagramServerSocket>* sockets) OVERRIDE; + ScopedVector<DatagramServerSocket>* sockets) override; void SimulateReceive(const uint8* packet, int size); diff --git a/net/dns/notify_watcher_mac.h b/net/dns/notify_watcher_mac.h index 01375d5..0951c2f 100644 --- a/net/dns/notify_watcher_mac.h +++ b/net/dns/notify_watcher_mac.h @@ -31,8 +31,8 @@ class NotifyWatcherMac : public base::MessageLoopForIO::Watcher { private: // MessageLoopForIO::Watcher: - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {} + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override {} int notify_fd_; int notify_token_; diff --git a/net/dns/record_rdata.h b/net/dns/record_rdata.h index def8e33..09a082f 100644 --- a/net/dns/record_rdata.h +++ b/net/dns/record_rdata.h @@ -48,8 +48,8 @@ class NET_EXPORT_PRIVATE SrvRecordRdata : public RecordRdata { static scoped_ptr<SrvRecordRdata> Create(const base::StringPiece& data, const DnsRecordParser& parser); - virtual bool IsEqual(const RecordRdata* other) const OVERRIDE; - virtual uint16 Type() const OVERRIDE; + virtual bool IsEqual(const RecordRdata* other) const override; + virtual uint16 Type() const override; uint16 priority() const { return priority_; } uint16 weight() const { return weight_; } @@ -78,8 +78,8 @@ class NET_EXPORT_PRIVATE ARecordRdata : public RecordRdata { virtual ~ARecordRdata(); static scoped_ptr<ARecordRdata> Create(const base::StringPiece& data, const DnsRecordParser& parser); - virtual bool IsEqual(const RecordRdata* other) const OVERRIDE; - virtual uint16 Type() const OVERRIDE; + virtual bool IsEqual(const RecordRdata* other) const override; + virtual uint16 Type() const override; const IPAddressNumber& address() const { return address_; } @@ -100,8 +100,8 @@ class NET_EXPORT_PRIVATE AAAARecordRdata : public RecordRdata { virtual ~AAAARecordRdata(); static scoped_ptr<AAAARecordRdata> Create(const base::StringPiece& data, const DnsRecordParser& parser); - virtual bool IsEqual(const RecordRdata* other) const OVERRIDE; - virtual uint16 Type() const OVERRIDE; + virtual bool IsEqual(const RecordRdata* other) const override; + virtual uint16 Type() const override; const IPAddressNumber& address() const { return address_; } @@ -122,8 +122,8 @@ class NET_EXPORT_PRIVATE CnameRecordRdata : public RecordRdata { virtual ~CnameRecordRdata(); static scoped_ptr<CnameRecordRdata> Create(const base::StringPiece& data, const DnsRecordParser& parser); - virtual bool IsEqual(const RecordRdata* other) const OVERRIDE; - virtual uint16 Type() const OVERRIDE; + virtual bool IsEqual(const RecordRdata* other) const override; + virtual uint16 Type() const override; std::string cname() const { return cname_; } @@ -144,8 +144,8 @@ class NET_EXPORT_PRIVATE PtrRecordRdata : public RecordRdata { virtual ~PtrRecordRdata(); static scoped_ptr<PtrRecordRdata> Create(const base::StringPiece& data, const DnsRecordParser& parser); - virtual bool IsEqual(const RecordRdata* other) const OVERRIDE; - virtual uint16 Type() const OVERRIDE; + virtual bool IsEqual(const RecordRdata* other) const override; + virtual uint16 Type() const override; std::string ptrdomain() const { return ptrdomain_; } @@ -167,8 +167,8 @@ class NET_EXPORT_PRIVATE TxtRecordRdata : public RecordRdata { virtual ~TxtRecordRdata(); static scoped_ptr<TxtRecordRdata> Create(const base::StringPiece& data, const DnsRecordParser& parser); - virtual bool IsEqual(const RecordRdata* other) const OVERRIDE; - virtual uint16 Type() const OVERRIDE; + virtual bool IsEqual(const RecordRdata* other) const override; + virtual uint16 Type() const override; const std::vector<std::string>& texts() const { return texts_; } @@ -191,8 +191,8 @@ class NET_EXPORT_PRIVATE NsecRecordRdata : public RecordRdata { virtual ~NsecRecordRdata(); static scoped_ptr<NsecRecordRdata> Create(const base::StringPiece& data, const DnsRecordParser& parser); - virtual bool IsEqual(const RecordRdata* other) const OVERRIDE; - virtual uint16 Type() const OVERRIDE; + virtual bool IsEqual(const RecordRdata* other) const override; + virtual uint16 Type() const override; // Length of the bitmap in bits. unsigned bitmap_length() const { return bitmap_.size() * 8; } diff --git a/net/dns/serial_worker_unittest.cc b/net/dns/serial_worker_unittest.cc index 442526f..c670a75 100644 --- a/net/dns/serial_worker_unittest.cc +++ b/net/dns/serial_worker_unittest.cc @@ -21,11 +21,11 @@ class SerialWorkerTest : public testing::Test { public: explicit TestSerialWorker(SerialWorkerTest* t) : test_(t) {} - virtual void DoWork() OVERRIDE { + virtual void DoWork() override { ASSERT_TRUE(test_); test_->OnWork(); } - virtual void OnWorkFinished() OVERRIDE { + virtual void OnWorkFinished() override { ASSERT_TRUE(test_); test_->OnWorkFinished(); } @@ -96,12 +96,12 @@ class SerialWorkerTest : public testing::Test { } // test::Test methods - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { message_loop_ = base::MessageLoop::current(); worker_ = new TestSerialWorker(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Cancel the worker to catch if it makes a late DoWork call. worker_->Cancel(); // Check if OnWork is stalled. diff --git a/net/dns/single_request_host_resolver_unittest.cc b/net/dns/single_request_host_resolver_unittest.cc index cc20bf3..7b09193 100644 --- a/net/dns/single_request_host_resolver_unittest.cc +++ b/net/dns/single_request_host_resolver_unittest.cc @@ -35,7 +35,7 @@ class HangingHostResolver : public HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { EXPECT_FALSE(has_outstanding_request()); outstanding_request_ = reinterpret_cast<RequestHandle>(0x1234); *out_req = outstanding_request_; @@ -47,12 +47,12 @@ class HangingHostResolver : public HostResolver { virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { NOTIMPLEMENTED(); return ERR_UNEXPECTED; } - virtual void CancelRequest(RequestHandle req) OVERRIDE { + virtual void CancelRequest(RequestHandle req) override { EXPECT_TRUE(has_outstanding_request()); EXPECT_EQ(req, outstanding_request_); outstanding_request_ = NULL; diff --git a/net/extras/sqlite/sqlite_channel_id_store.h b/net/extras/sqlite/sqlite_channel_id_store.h index 9d032a3..e743ba6 100644 --- a/net/extras/sqlite/sqlite_channel_id_store.h +++ b/net/extras/sqlite/sqlite_channel_id_store.h @@ -36,12 +36,12 @@ class SQLiteChannelIDStore : public DefaultChannelIDStore::PersistentStore { const scoped_refptr<base::SequencedTaskRunner>& background_task_runner); // DefaultChannelIDStore::PersistentStore: - virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE; + virtual void Load(const LoadedCallback& loaded_callback) override; virtual void AddChannelID( - const DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE; + const DefaultChannelIDStore::ChannelID& channel_id) override; virtual void DeleteChannelID( - const DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE; - virtual void SetForceKeepSessionState() OVERRIDE; + const DefaultChannelIDStore::ChannelID& channel_id) override; + virtual void SetForceKeepSessionState() override; // Delete channel ids from servers in |server_identifiers|. void DeleteAllInList(const std::list<std::string>& server_identifiers); diff --git a/net/filter/gzip_filter.h b/net/filter/gzip_filter.h index 0ae284a..07b7821 100644 --- a/net/filter/gzip_filter.h +++ b/net/filter/gzip_filter.h @@ -49,7 +49,7 @@ class GZipFilter : public Filter { // return. For example, the internal zlib may process some pre-filter data // but not produce output yet. virtual FilterStatus ReadFilteredData(char* dest_buffer, - int* dest_len) OVERRIDE; + int* dest_len) override; private: enum DecodingStatus { diff --git a/net/filter/mock_filter_context.h b/net/filter/mock_filter_context.h index a68f456..bdef812 100644 --- a/net/filter/mock_filter_context.h +++ b/net/filter/mock_filter_context.h @@ -41,37 +41,37 @@ class MockFilterContext : public FilterContext { // of those interfaces as coding errors. void NukeUnstableInterfaces(); - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; + virtual bool GetMimeType(std::string* mime_type) const override; // What URL was used to access this data? // Return false if gurl is not present. - virtual bool GetURL(GURL* gurl) const OVERRIDE; + virtual bool GetURL(GURL* gurl) const override; // What Content-Disposition did the server supply for this data? // Return false if Content-Disposition was not present. - virtual bool GetContentDisposition(std::string* disposition) const OVERRIDE; + virtual bool GetContentDisposition(std::string* disposition) const override; // What was this data requested from a server? - virtual base::Time GetRequestTime() const OVERRIDE; + virtual base::Time GetRequestTime() const override; // Is data supplied from cache, or fresh across the net? - virtual bool IsCachedContent() const OVERRIDE; + virtual bool IsCachedContent() const override; // Is this a download? - virtual bool IsDownload() const OVERRIDE; + virtual bool IsDownload() const override; // Was this data flagged as a response to a request with an SDCH dictionary? - virtual bool SdchResponseExpected() const OVERRIDE; + virtual bool SdchResponseExpected() const override; // How many bytes were fed to filter(s) so far? - virtual int64 GetByteReadCount() const OVERRIDE; + virtual int64 GetByteReadCount() const override; - virtual int GetResponseCode() const OVERRIDE; + virtual int GetResponseCode() const override; // The URLRequestContext associated with the request. - virtual const URLRequestContext* GetURLRequestContext() const OVERRIDE; + virtual const URLRequestContext* GetURLRequestContext() const override; - virtual void RecordPacketStats(StatisticSelector statistic) const OVERRIDE {} + virtual void RecordPacketStats(StatisticSelector statistic) const override {} private: int buffer_size_; diff --git a/net/filter/sdch_filter.h b/net/filter/sdch_filter.h index 3cea340..861a9ae 100644 --- a/net/filter/sdch_filter.h +++ b/net/filter/sdch_filter.h @@ -41,7 +41,7 @@ class NET_EXPORT_PRIVATE SdchFilter : public Filter { // destination buffer. Upon exit, *dest_len is the actual number of chars // written into the destination buffer. virtual FilterStatus ReadFilteredData(char* dest_buffer, - int* dest_len) OVERRIDE; + int* dest_len) override; private: // Internal status. Once we enter an error state, we stop processing data. diff --git a/net/ftp/ftp_network_layer.h b/net/ftp/ftp_network_layer.h index 6040d02..6242f74 100644 --- a/net/ftp/ftp_network_layer.h +++ b/net/ftp/ftp_network_layer.h @@ -24,8 +24,8 @@ class NET_EXPORT FtpNetworkLayer : public FtpTransactionFactory { static FtpTransactionFactory* CreateFactory(HostResolver* host_resolver); // FtpTransactionFactory methods: - virtual FtpTransaction* CreateTransaction() OVERRIDE; - virtual void Suspend(bool suspend) OVERRIDE; + virtual FtpTransaction* CreateTransaction() override; + virtual void Suspend(bool suspend) override; private: scoped_refptr<FtpNetworkSession> session_; diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h index 5eb6aae7..ee0f28a 100644 --- a/net/ftp/ftp_network_transaction.h +++ b/net/ftp/ftp_network_transaction.h @@ -38,14 +38,14 @@ class NET_EXPORT_PRIVATE FtpNetworkTransaction : public FtpTransaction { // FtpTransaction methods: virtual int Start(const FtpRequestInfo* request_info, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual int RestartWithAuth(const AuthCredentials& credentials, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual const FtpResponseInfo* GetResponseInfo() const OVERRIDE; - virtual LoadState GetLoadState() const OVERRIDE; - virtual uint64 GetUploadProgress() const OVERRIDE; + const CompletionCallback& callback) override; + virtual const FtpResponseInfo* GetResponseInfo() const override; + virtual LoadState GetLoadState() const override; + virtual uint64 GetUploadProgress() const override; private: FRIEND_TEST_ALL_PREFIXES(FtpNetworkTransactionTest, diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc index c058d38..de407d5 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()) { diff --git a/net/http/disk_cache_based_quic_server_info.h b/net/http/disk_cache_based_quic_server_info.h index b0bb15c..7707037 100644 --- a/net/http/disk_cache_based_quic_server_info.h +++ b/net/http/disk_cache_based_quic_server_info.h @@ -31,11 +31,11 @@ class NET_EXPORT_PRIVATE DiskCacheBasedQuicServerInfo HttpCache* http_cache); // QuicServerInfo implementation. - virtual void Start() OVERRIDE; - virtual int WaitForDataReady(const CompletionCallback& callback) OVERRIDE; - virtual bool IsDataReady() OVERRIDE; - virtual bool IsReadyToPersist() OVERRIDE; - virtual void Persist() OVERRIDE; + virtual void Start() override; + virtual int WaitForDataReady(const CompletionCallback& callback) override; + virtual bool IsDataReady() override; + virtual bool IsReadyToPersist() override; + virtual void Persist() override; private: struct CacheOperationDataShim; diff --git a/net/http/failing_http_transaction_factory.cc b/net/http/failing_http_transaction_factory.cc index 23a184f..0b97aa2a 100644 --- a/net/http/failing_http_transaction_factory.cc +++ b/net/http/failing_http_transaction_factory.cc @@ -34,38 +34,38 @@ class FailingHttpTransaction : public HttpTransaction { // HttpTransaction virtual int Start(const HttpRequestInfo* request_info, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual int RestartIgnoringLastError( - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int RestartWithCertificate( X509Certificate* client_cert, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int RestartWithAuth( const AuthCredentials& credentials, - const CompletionCallback& callback) OVERRIDE; - virtual bool IsReadyToRestartForAuth() OVERRIDE; + const CompletionCallback& callback) override; + virtual bool IsReadyToRestartForAuth() override; virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void StopCaching() OVERRIDE; + const CompletionCallback& callback) override; + virtual void StopCaching() override; virtual bool GetFullRequestHeaders( - HttpRequestHeaders* headers) const OVERRIDE; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; - virtual void DoneReading() OVERRIDE; - virtual const HttpResponseInfo* GetResponseInfo() const OVERRIDE; - virtual LoadState GetLoadState() const OVERRIDE; - virtual UploadProgress GetUploadProgress() const OVERRIDE; + HttpRequestHeaders* headers) const override; + virtual int64 GetTotalReceivedBytes() const override; + virtual void DoneReading() override; + virtual const HttpResponseInfo* GetResponseInfo() const override; + virtual LoadState GetLoadState() const override; + virtual UploadProgress GetUploadProgress() const override; virtual void SetQuicServerInfo( - net::QuicServerInfo* quic_server_info) OVERRIDE; + net::QuicServerInfo* quic_server_info) override; virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual void SetPriority(RequestPriority priority) override; virtual void SetWebSocketHandshakeStreamCreateHelper( - WebSocketHandshakeStreamBase::CreateHelper* create_helper) OVERRIDE; + WebSocketHandshakeStreamBase::CreateHelper* create_helper) override; virtual void SetBeforeNetworkStartCallback( - const BeforeNetworkStartCallback& callback) OVERRIDE; + const BeforeNetworkStartCallback& callback) override; virtual void SetBeforeProxyHeadersSentCallback( - const BeforeProxyHeadersSentCallback& callback) OVERRIDE; - virtual int ResumeNetworkStart() OVERRIDE; + const BeforeProxyHeadersSentCallback& callback) override; + virtual int ResumeNetworkStart() override; private: Error error_; diff --git a/net/http/failing_http_transaction_factory.h b/net/http/failing_http_transaction_factory.h index 84d87a7..8a785f5 100644 --- a/net/http/failing_http_transaction_factory.h +++ b/net/http/failing_http_transaction_factory.h @@ -28,9 +28,9 @@ class NET_EXPORT FailingHttpTransactionFactory : public HttpTransactionFactory { // HttpTransactionFactory: virtual int CreateTransaction( RequestPriority priority, - scoped_ptr<HttpTransaction>* trans) OVERRIDE; - virtual HttpCache* GetCache() OVERRIDE; - virtual HttpNetworkSession* GetSession() OVERRIDE; + scoped_ptr<HttpTransaction>* trans) override; + virtual HttpCache* GetCache() override; + virtual HttpNetworkSession* GetSession() override; private: HttpNetworkSession* session_; diff --git a/net/http/http_auth_cache_unittest.cc b/net/http/http_auth_cache_unittest.cc index e925c71..4002bab 100644 --- a/net/http/http_auth_cache_unittest.cc +++ b/net/http/http_auth_cache_unittest.cc @@ -33,19 +33,19 @@ class MockAuthHandler : public HttpAuthHandler { } virtual HttpAuth::AuthorizationResult HandleAnotherChallenge( - HttpAuthChallengeTokenizer* challenge) OVERRIDE { + HttpAuthChallengeTokenizer* challenge) override { return HttpAuth::AUTHORIZATION_RESULT_REJECT; } protected: - virtual bool Init(HttpAuthChallengeTokenizer* challenge) OVERRIDE { + virtual bool Init(HttpAuthChallengeTokenizer* challenge) override { return false; // Unused. } virtual int GenerateAuthTokenImpl(const AuthCredentials*, const HttpRequestInfo*, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE { + std::string* auth_token) override { *auth_token = "mock-credentials"; return OK; } diff --git a/net/http/http_auth_controller_unittest.cc b/net/http/http_auth_controller_unittest.cc index 1a59b8d..306cabd 100644 --- a/net/http/http_auth_controller_unittest.cc +++ b/net/http/http_auth_controller_unittest.cc @@ -128,7 +128,7 @@ TEST(HttpAuthControllerTest, NoExplicitCredentialsAllowed) { } protected: - virtual bool Init(HttpAuthChallengeTokenizer* challenge) OVERRIDE { + virtual bool Init(HttpAuthChallengeTokenizer* challenge) override { HttpAuthHandlerMock::Init(challenge); set_allows_default_credentials(true); set_allows_explicit_credentials(false); @@ -146,7 +146,7 @@ TEST(HttpAuthControllerTest, NoExplicitCredentialsAllowed) { virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE { + std::string* auth_token) override { int result = HttpAuthHandlerMock::GenerateAuthTokenImpl(credentials, request, callback, diff --git a/net/http/http_auth_filter.h b/net/http/http_auth_filter.h index 9f09ac1..419b8af 100644 --- a/net/http/http_auth_filter.h +++ b/net/http/http_auth_filter.h @@ -46,7 +46,7 @@ class NET_EXPORT HttpAuthFilterWhitelist : public HttpAuthFilter { const ProxyBypassRules& rules() const { return rules_; } // HttpAuthFilter methods: - virtual bool IsValid(const GURL& url, HttpAuth::Target target) const OVERRIDE; + virtual bool IsValid(const GURL& url, HttpAuth::Target target) const override; private: // Installs the whitelist. diff --git a/net/http/http_auth_gssapi_posix.h b/net/http/http_auth_gssapi_posix.h index 2e7b99b..41a1805 100644 --- a/net/http/http_auth_gssapi_posix.h +++ b/net/http/http_auth_gssapi_posix.h @@ -112,30 +112,30 @@ class NET_EXPORT_PRIVATE GSSAPISharedLibrary : public GSSAPILibrary { virtual ~GSSAPISharedLibrary(); // GSSAPILibrary methods: - virtual bool Init() OVERRIDE; + virtual bool Init() override; virtual OM_uint32 import_name( OM_uint32* minor_status, const gss_buffer_t input_name_buffer, const gss_OID input_name_type, - gss_name_t* output_name) OVERRIDE; + gss_name_t* output_name) override; virtual OM_uint32 release_name( OM_uint32* minor_status, - gss_name_t* input_name) OVERRIDE; + gss_name_t* input_name) override; virtual OM_uint32 release_buffer( OM_uint32* minor_status, - gss_buffer_t buffer) OVERRIDE; + gss_buffer_t buffer) override; virtual OM_uint32 display_name( OM_uint32* minor_status, const gss_name_t input_name, gss_buffer_t output_name_buffer, - gss_OID* output_name_type) OVERRIDE; + gss_OID* output_name_type) override; virtual OM_uint32 display_status( OM_uint32* minor_status, OM_uint32 status_value, int status_type, const gss_OID mech_type, OM_uint32* message_contex, - gss_buffer_t status_string) OVERRIDE; + gss_buffer_t status_string) override; virtual OM_uint32 init_sec_context( OM_uint32* minor_status, const gss_cred_id_t initiator_cred_handle, @@ -149,18 +149,18 @@ class NET_EXPORT_PRIVATE GSSAPISharedLibrary : public GSSAPILibrary { gss_OID* actual_mech_type, gss_buffer_t output_token, OM_uint32* ret_flags, - OM_uint32* time_rec) OVERRIDE; + OM_uint32* time_rec) override; virtual OM_uint32 wrap_size_limit( OM_uint32* minor_status, const gss_ctx_id_t context_handle, int conf_req_flag, gss_qop_t qop_req, OM_uint32 req_output_size, - OM_uint32* max_input_size) OVERRIDE; + OM_uint32* max_input_size) override; virtual OM_uint32 delete_sec_context( OM_uint32* minor_status, gss_ctx_id_t* context_handle, - gss_buffer_t output_token) OVERRIDE; + gss_buffer_t output_token) override; virtual OM_uint32 inquire_context( OM_uint32* minor_status, const gss_ctx_id_t context_handle, @@ -170,7 +170,7 @@ class NET_EXPORT_PRIVATE GSSAPISharedLibrary : public GSSAPILibrary { gss_OID* mech_type, OM_uint32* ctx_flags, int* locally_initiated, - int* open) OVERRIDE; + int* open) override; private: typedef typeof(&gss_import_name) gss_import_name_type; diff --git a/net/http/http_auth_handler_basic.h b/net/http/http_auth_handler_basic.h index 5d786f9..f718786 100644 --- a/net/http/http_auth_handler_basic.h +++ b/net/http/http_auth_handler_basic.h @@ -28,19 +28,19 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerBasic : public HttpAuthHandler { CreateReason reason, int digest_nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE; + scoped_ptr<HttpAuthHandler>* handler) override; }; virtual HttpAuth::AuthorizationResult HandleAnotherChallenge( - HttpAuthChallengeTokenizer* challenge) OVERRIDE; + HttpAuthChallengeTokenizer* challenge) override; protected: - virtual bool Init(HttpAuthChallengeTokenizer* challenge) OVERRIDE; + virtual bool Init(HttpAuthChallengeTokenizer* challenge) override; virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE; + std::string* auth_token) override; private: virtual ~HttpAuthHandlerBasic() {} diff --git a/net/http/http_auth_handler_digest.h b/net/http/http_auth_handler_digest.h index 6a960d9..ca148fe 100644 --- a/net/http/http_auth_handler_digest.h +++ b/net/http/http_auth_handler_digest.h @@ -38,7 +38,7 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerDigest : public HttpAuthHandler { class DynamicNonceGenerator : public NonceGenerator { public: DynamicNonceGenerator(); - virtual std::string GenerateNonce() const OVERRIDE; + virtual std::string GenerateNonce() const override; private: DISALLOW_COPY_AND_ASSIGN(DynamicNonceGenerator); }; @@ -49,7 +49,7 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerDigest : public HttpAuthHandler { public: explicit FixedNonceGenerator(const std::string& nonce); - virtual std::string GenerateNonce() const OVERRIDE; + virtual std::string GenerateNonce() const override; private: const std::string nonce_; @@ -71,22 +71,22 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerDigest : public HttpAuthHandler { CreateReason reason, int digest_nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE; + scoped_ptr<HttpAuthHandler>* handler) override; private: scoped_ptr<const NonceGenerator> nonce_generator_; }; virtual HttpAuth::AuthorizationResult HandleAnotherChallenge( - HttpAuthChallengeTokenizer* challenge) OVERRIDE; + HttpAuthChallengeTokenizer* challenge) override; protected: - virtual bool Init(HttpAuthChallengeTokenizer* challenge) OVERRIDE; + virtual bool Init(HttpAuthChallengeTokenizer* challenge) override; virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE; + std::string* auth_token) override; private: FRIEND_TEST_ALL_PREFIXES(HttpAuthHandlerDigestTest, ParseChallenge); diff --git a/net/http/http_auth_handler_factory.h b/net/http/http_auth_handler_factory.h index e712aaf..efb432a 100644 --- a/net/http/http_auth_handler_factory.h +++ b/net/http/http_auth_handler_factory.h @@ -189,7 +189,7 @@ class NET_EXPORT HttpAuthHandlerRegistryFactory CreateReason reason, int digest_nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE; + scoped_ptr<HttpAuthHandler>* handler) override; private: typedef std::map<std::string, HttpAuthHandlerFactory*> FactoryMap; diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc index 06e8933..9860623 100644 --- a/net/http/http_auth_handler_factory_unittest.cc +++ b/net/http/http_auth_handler_factory_unittest.cc @@ -27,7 +27,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory { CreateReason reason, int nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE { + scoped_ptr<HttpAuthHandler>* handler) override { handler->reset(); return return_code_; } diff --git a/net/http/http_auth_handler_mock.h b/net/http/http_auth_handler_mock.h index fd9885b..b903e8c 100644 --- a/net/http/http_auth_handler_mock.h +++ b/net/http/http_auth_handler_mock.h @@ -49,7 +49,7 @@ class HttpAuthHandlerMock : public HttpAuthHandler { CreateReason reason, int nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE; + scoped_ptr<HttpAuthHandler>* handler) override; private: ScopedVector<HttpAuthHandler> handlers_[HttpAuth::AUTH_NUM_TARGETS]; @@ -88,18 +88,18 @@ class HttpAuthHandlerMock : public HttpAuthHandler { // HttpAuthHandler: virtual HttpAuth::AuthorizationResult HandleAnotherChallenge( - HttpAuthChallengeTokenizer* challenge) OVERRIDE; - virtual bool NeedsIdentity() OVERRIDE; - virtual bool AllowsDefaultCredentials() OVERRIDE; - virtual bool AllowsExplicitCredentials() OVERRIDE; + HttpAuthChallengeTokenizer* challenge) override; + virtual bool NeedsIdentity() override; + virtual bool AllowsDefaultCredentials() override; + virtual bool AllowsExplicitCredentials() override; protected: - virtual bool Init(HttpAuthChallengeTokenizer* challenge) OVERRIDE; + virtual bool Init(HttpAuthChallengeTokenizer* challenge) override; virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE; + std::string* auth_token) override; private: void OnResolveCanonicalName(); diff --git a/net/http/http_auth_handler_negotiate.h b/net/http/http_auth_handler_negotiate.h index 90bd16ce..8ff9244 100644 --- a/net/http/http_auth_handler_negotiate.h +++ b/net/http/http_auth_handler_negotiate.h @@ -76,7 +76,7 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler { CreateReason reason, int digest_nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE; + scoped_ptr<HttpAuthHandler>* handler) override; private: bool disable_cname_lookup_; @@ -107,18 +107,18 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler { // HttpAuthHandler: virtual HttpAuth::AuthorizationResult HandleAnotherChallenge( - HttpAuthChallengeTokenizer* challenge) OVERRIDE; - virtual bool NeedsIdentity() OVERRIDE; - virtual bool AllowsDefaultCredentials() OVERRIDE; - virtual bool AllowsExplicitCredentials() OVERRIDE; + HttpAuthChallengeTokenizer* challenge) override; + virtual bool NeedsIdentity() override; + virtual bool AllowsDefaultCredentials() override; + virtual bool AllowsExplicitCredentials() override; protected: - virtual bool Init(HttpAuthChallengeTokenizer* challenge) OVERRIDE; + virtual bool Init(HttpAuthChallengeTokenizer* challenge) override; virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE; + std::string* auth_token) override; private: enum State { diff --git a/net/http/http_auth_handler_ntlm.h b/net/http/http_auth_handler_ntlm.h index 9e2abc6..5a998ac 100644 --- a/net/http/http_auth_handler_ntlm.h +++ b/net/http/http_auth_handler_ntlm.h @@ -48,7 +48,7 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNTLM : public HttpAuthHandler { CreateReason reason, int digest_nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE; + scoped_ptr<HttpAuthHandler>* handler) override; #if defined(NTLM_SSPI) // Set the SSPILibrary to use. Typically the only callers which need to use // this are unit tests which pass in a mocked-out version of the SSPI @@ -104,24 +104,24 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNTLM : public HttpAuthHandler { URLSecurityManager* url_security_manager); #endif - virtual bool NeedsIdentity() OVERRIDE; + virtual bool NeedsIdentity() override; - virtual bool AllowsDefaultCredentials() OVERRIDE; + virtual bool AllowsDefaultCredentials() override; virtual HttpAuth::AuthorizationResult HandleAnotherChallenge( - HttpAuthChallengeTokenizer* challenge) OVERRIDE; + HttpAuthChallengeTokenizer* challenge) override; protected: // This function acquires a credentials handle in the SSPI implementation. // It does nothing in the portable implementation. int InitializeBeforeFirstChallenge(); - virtual bool Init(HttpAuthChallengeTokenizer* tok) OVERRIDE; + virtual bool Init(HttpAuthChallengeTokenizer* tok) override; virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE; + std::string* auth_token) override; private: virtual ~HttpAuthHandlerNTLM(); diff --git a/net/http/http_basic_stream.h b/net/http/http_basic_stream.h index 00253c3..541994d 100644 --- a/net/http/http_basic_stream.h +++ b/net/http/http_basic_stream.h @@ -36,49 +36,49 @@ class HttpBasicStream : public HttpStream { virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int SendRequest(const HttpRequestHeaders& headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; - virtual UploadProgress GetUploadProgress() const OVERRIDE; + virtual UploadProgress GetUploadProgress() const override; - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE; + virtual int ReadResponseHeaders(const CompletionCallback& callback) override; virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; - virtual void Close(bool not_reusable) OVERRIDE; + virtual void Close(bool not_reusable) override; - virtual HttpStream* RenewStreamForAuth() OVERRIDE; + virtual HttpStream* RenewStreamForAuth() override; - virtual bool IsResponseBodyComplete() const OVERRIDE; + virtual bool IsResponseBodyComplete() const override; - virtual bool CanFindEndOfResponse() const OVERRIDE; + virtual bool CanFindEndOfResponse() const override; - virtual bool IsConnectionReused() const OVERRIDE; + virtual bool IsConnectionReused() const override; - virtual void SetConnectionReused() OVERRIDE; + virtual void SetConnectionReused() override; - virtual bool IsConnectionReusable() const OVERRIDE; + virtual bool IsConnectionReusable() const override; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; + virtual int64 GetTotalReceivedBytes() const override; virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; + LoadTimingInfo* load_timing_info) const override; - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual void GetSSLInfo(SSLInfo* ssl_info) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; - virtual bool IsSpdyHttpStream() const OVERRIDE; + virtual bool IsSpdyHttpStream() const override; - virtual void Drain(HttpNetworkSession* session) OVERRIDE; + virtual void Drain(HttpNetworkSession* session) override; - virtual void SetPriority(RequestPriority priority) OVERRIDE; + virtual void SetPriority(RequestPriority priority) override; private: HttpStreamParser* parser() const { return state_.parser(); } diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index cbf2615e..2048e36 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -286,7 +286,7 @@ class HttpCache::QuicServerInfoFactoryAdaptor : public QuicServerInfoFactory { } virtual QuicServerInfo* GetForServer( - const QuicServerId& server_id) OVERRIDE { + const QuicServerId& server_id) override { return new DiskCacheBasedQuicServerInfo(server_id, http_cache_); } diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 3f59839..5e6851f 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -116,7 +116,7 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory, // BackendFactory implementation. virtual int CreateBackend(NetLog* net_log, scoped_ptr<disk_cache::Backend>* backend, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: CacheType type_; @@ -214,9 +214,9 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory, // HttpTransactionFactory implementation: virtual int CreateTransaction(RequestPriority priority, - scoped_ptr<HttpTransaction>* trans) OVERRIDE; - virtual HttpCache* GetCache() OVERRIDE; - virtual HttpNetworkSession* GetSession() OVERRIDE; + scoped_ptr<HttpTransaction>* trans) override; + virtual HttpCache* GetCache() override; + virtual HttpNetworkSession* GetSession() override; base::WeakPtr<HttpCache> GetWeakPtr() { return weak_factory_.GetWeakPtr(); } diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h index b63e859..cc1f467 100644 --- a/net/http/http_cache_transaction.h +++ b/net/http/http_cache_transaction.h @@ -112,37 +112,37 @@ class HttpCache::Transaction : public HttpTransaction { // HttpTransaction methods: virtual int Start(const HttpRequestInfo* request_info, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual int RestartIgnoringLastError( - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int RestartWithCertificate( X509Certificate* client_cert, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int RestartWithAuth(const AuthCredentials& credentials, - const CompletionCallback& callback) OVERRIDE; - virtual bool IsReadyToRestartForAuth() OVERRIDE; + const CompletionCallback& callback) override; + virtual bool IsReadyToRestartForAuth() override; virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void StopCaching() OVERRIDE; + const CompletionCallback& callback) override; + virtual void StopCaching() override; virtual bool GetFullRequestHeaders( - HttpRequestHeaders* headers) const OVERRIDE; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; - virtual void DoneReading() OVERRIDE; - virtual const HttpResponseInfo* GetResponseInfo() const OVERRIDE; - virtual LoadState GetLoadState() const OVERRIDE; - virtual UploadProgress GetUploadProgress(void) const OVERRIDE; - virtual void SetQuicServerInfo(QuicServerInfo* quic_server_info) OVERRIDE; + HttpRequestHeaders* headers) const override; + virtual int64 GetTotalReceivedBytes() const override; + virtual void DoneReading() override; + virtual const HttpResponseInfo* GetResponseInfo() const override; + virtual LoadState GetLoadState() const override; + virtual UploadProgress GetUploadProgress(void) const override; + virtual void SetQuicServerInfo(QuicServerInfo* quic_server_info) override; virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual void SetPriority(RequestPriority priority) override; virtual void SetWebSocketHandshakeStreamCreateHelper( - net::WebSocketHandshakeStreamBase::CreateHelper* create_helper) OVERRIDE; + net::WebSocketHandshakeStreamBase::CreateHelper* create_helper) override; virtual void SetBeforeNetworkStartCallback( - const BeforeNetworkStartCallback& callback) OVERRIDE; + const BeforeNetworkStartCallback& callback) override; virtual void SetBeforeProxyHeadersSentCallback( - const BeforeProxyHeadersSentCallback& callback) OVERRIDE; - virtual int ResumeNetworkStart() OVERRIDE; + const BeforeProxyHeadersSentCallback& callback) override; + virtual int ResumeNetworkStart() override; private: static const size_t kNumValidationHeaders = 2; diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index a7a04f1..8081bd7 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc @@ -498,12 +498,12 @@ class FakeWebSocketHandshakeStreamCreateHelper public: virtual ~FakeWebSocketHandshakeStreamCreateHelper() {} virtual net::WebSocketHandshakeStreamBase* CreateBasicStream( - scoped_ptr<net::ClientSocketHandle> connect, bool using_proxy) OVERRIDE { + scoped_ptr<net::ClientSocketHandle> connect, bool using_proxy) override { return NULL; } virtual net::WebSocketHandshakeStreamBase* CreateSpdyStream( const base::WeakPtr<net::SpdySession>& session, - bool use_relative_url) OVERRIDE { + bool use_relative_url) override { return NULL; } }; diff --git a/net/http/http_network_layer.h b/net/http/http_network_layer.h index fc94d0a..58b02f2 100644 --- a/net/http/http_network_layer.h +++ b/net/http/http_network_layer.h @@ -44,13 +44,13 @@ class NET_EXPORT HttpNetworkLayer // HttpTransactionFactory methods: virtual int CreateTransaction(RequestPriority priority, - scoped_ptr<HttpTransaction>* trans) OVERRIDE; - virtual HttpCache* GetCache() OVERRIDE; - virtual HttpNetworkSession* GetSession() OVERRIDE; + scoped_ptr<HttpTransaction>* trans) override; + virtual HttpCache* GetCache() override; + virtual HttpNetworkSession* GetSession() override; // base::PowerObserver methods: - virtual void OnSuspend() OVERRIDE; - virtual void OnResume() OVERRIDE; + virtual void OnSuspend() override; + virtual void OnResume() override; private: const scoped_refptr<HttpNetworkSession> session_; diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 895ecc3..57ebdf7 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -47,63 +47,63 @@ class NET_EXPORT_PRIVATE HttpNetworkTransaction // HttpTransaction methods: virtual int Start(const HttpRequestInfo* request_info, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual int RestartIgnoringLastError( - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int RestartWithCertificate( X509Certificate* client_cert, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int RestartWithAuth(const AuthCredentials& credentials, - const CompletionCallback& callback) OVERRIDE; - virtual bool IsReadyToRestartForAuth() OVERRIDE; + const CompletionCallback& callback) override; + virtual bool IsReadyToRestartForAuth() override; virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void StopCaching() OVERRIDE; + const CompletionCallback& callback) override; + virtual void StopCaching() override; virtual bool GetFullRequestHeaders( - HttpRequestHeaders* headers) const OVERRIDE; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; - virtual void DoneReading() OVERRIDE; - virtual const HttpResponseInfo* GetResponseInfo() const OVERRIDE; - virtual LoadState GetLoadState() const OVERRIDE; - virtual UploadProgress GetUploadProgress() const OVERRIDE; - virtual void SetQuicServerInfo(QuicServerInfo* quic_server_info) OVERRIDE; + HttpRequestHeaders* headers) const override; + virtual int64 GetTotalReceivedBytes() const override; + virtual void DoneReading() override; + virtual const HttpResponseInfo* GetResponseInfo() const override; + virtual LoadState GetLoadState() const override; + virtual UploadProgress GetUploadProgress() const override; + virtual void SetQuicServerInfo(QuicServerInfo* quic_server_info) override; virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual void SetPriority(RequestPriority priority) override; virtual void SetWebSocketHandshakeStreamCreateHelper( - WebSocketHandshakeStreamBase::CreateHelper* create_helper) OVERRIDE; + WebSocketHandshakeStreamBase::CreateHelper* create_helper) override; virtual void SetBeforeNetworkStartCallback( - const BeforeNetworkStartCallback& callback) OVERRIDE; + const BeforeNetworkStartCallback& callback) override; virtual void SetBeforeProxyHeadersSentCallback( - const BeforeProxyHeadersSentCallback& callback) OVERRIDE; - virtual int ResumeNetworkStart() OVERRIDE; + const BeforeProxyHeadersSentCallback& callback) override; + virtual int ResumeNetworkStart() override; // HttpStreamRequest::Delegate methods: virtual void OnStreamReady(const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpStreamBase* stream) OVERRIDE; + HttpStreamBase* stream) override; virtual void OnWebSocketHandshakeStreamReady( const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - WebSocketHandshakeStreamBase* stream) OVERRIDE; + WebSocketHandshakeStreamBase* stream) override; virtual void OnStreamFailed(int status, - const SSLConfig& used_ssl_config) OVERRIDE; + const SSLConfig& used_ssl_config) override; virtual void OnCertificateError(int status, const SSLConfig& used_ssl_config, - const SSLInfo& ssl_info) OVERRIDE; + const SSLInfo& ssl_info) override; virtual void OnNeedsProxyAuth( const HttpResponseInfo& response_info, const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpAuthController* auth_controller) OVERRIDE; + HttpAuthController* auth_controller) override; virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config, - SSLCertRequestInfo* cert_info) OVERRIDE; + SSLCertRequestInfo* cert_info) override; virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info, const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpStreamBase* stream) OVERRIDE; + HttpStreamBase* stream) override; private: friend class HttpNetworkTransactionSSLTest; diff --git a/net/http/http_network_transaction_ssl_unittest.cc b/net/http/http_network_transaction_ssl_unittest.cc index ab7eadf..7b95f79 100644 --- a/net/http/http_network_transaction_ssl_unittest.cc +++ b/net/http/http_network_transaction_ssl_unittest.cc @@ -31,7 +31,7 @@ class TLS10SSLConfigService : public SSLConfigService { ssl_config_.version_max = SSL_PROTOCOL_VERSION_TLS1; } - virtual void GetSSLConfig(SSLConfig* config) OVERRIDE { + virtual void GetSSLConfig(SSLConfig* config) override { *config = ssl_config_; } @@ -48,7 +48,7 @@ class TLS11SSLConfigService : public SSLConfigService { ssl_config_.version_max = SSL_PROTOCOL_VERSION_TLS1_1; } - virtual void GetSSLConfig(SSLConfig* config) OVERRIDE { + virtual void GetSSLConfig(SSLConfig* config) override { *config = ssl_config_; } diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index ce61d6e..4b2f0a4 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -8198,15 +8198,15 @@ TEST_P(HttpNetworkTransactionTest, CancelDuringInitRequestBody) { const CompletionCallback& callback() const { return callback_; } // UploadElementReader overrides: - virtual int Init(const CompletionCallback& callback) OVERRIDE { + virtual int Init(const CompletionCallback& callback) override { callback_ = callback; return ERR_IO_PENDING; } - virtual uint64 GetContentLength() const OVERRIDE { return 0; } - virtual uint64 BytesRemaining() const OVERRIDE { return 0; } + virtual uint64 GetContentLength() const override { return 0; } + virtual uint64 BytesRemaining() const override { return 0; } virtual int Read(IOBuffer* buf, int buf_length, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } @@ -9105,7 +9105,7 @@ class CapturingProxyResolver : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { ProxyServer proxy_server(ProxyServer::SCHEME_HTTP, HostPortPair("myproxy", 80)); results->UseProxyServer(proxy_server); @@ -9113,21 +9113,21 @@ class CapturingProxyResolver : public ProxyResolver { return OK; } - virtual void CancelRequest(RequestHandle request) OVERRIDE { + virtual void CancelRequest(RequestHandle request) override { NOTREACHED(); } - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { + virtual LoadState GetLoadState(RequestHandle request) const override { NOTREACHED(); return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() OVERRIDE { + virtual void CancelSetPacScript() override { NOTREACHED(); } virtual int SetPacScript(const scoped_refptr<ProxyResolverScriptData>&, - const CompletionCallback& /*callback*/) OVERRIDE { + const CompletionCallback& /*callback*/) override { return OK; } @@ -10069,7 +10069,7 @@ class UrlRecordingHttpAuthHandlerMock : public HttpAuthHandlerMock { virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials, const HttpRequestInfo* request, const CompletionCallback& callback, - std::string* auth_token) OVERRIDE { + std::string* auth_token) override { *url_ = request->url; return HttpAuthHandlerMock::GenerateAuthTokenImpl( credentials, request, callback, auth_token); @@ -11166,21 +11166,21 @@ class OneTimeCachingHostResolver : public net::HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { return host_resolver_.Resolve( info, priority, addresses, callback, out_req, net_log); } virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { int rv = host_resolver_.ResolveFromCache(info, addresses, net_log); if (rv == OK && info.host_port_pair().Equals(host_port_)) host_resolver_.GetHostCache()->clear(); return rv; } - virtual void CancelRequest(RequestHandle req) OVERRIDE { + virtual void CancelRequest(RequestHandle req) override { host_resolver_.CancelRequest(req); } @@ -12212,83 +12212,83 @@ class FakeStream : public HttpStreamBase, virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { ADD_FAILURE(); return ERR_UNEXPECTED; } - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE { + virtual int ReadResponseHeaders(const CompletionCallback& callback) override { ADD_FAILURE(); return ERR_UNEXPECTED; } virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { ADD_FAILURE(); return ERR_UNEXPECTED; } - virtual void Close(bool not_reusable) OVERRIDE {} + virtual void Close(bool not_reusable) override {} - virtual bool IsResponseBodyComplete() const OVERRIDE { + virtual bool IsResponseBodyComplete() const override { ADD_FAILURE(); return false; } - virtual bool CanFindEndOfResponse() const OVERRIDE { + virtual bool CanFindEndOfResponse() const override { return false; } - virtual bool IsConnectionReused() const OVERRIDE { + virtual bool IsConnectionReused() const override { ADD_FAILURE(); return false; } - virtual void SetConnectionReused() OVERRIDE { + virtual void SetConnectionReused() override { ADD_FAILURE(); } - virtual bool IsConnectionReusable() const OVERRIDE { + virtual bool IsConnectionReusable() const override { ADD_FAILURE(); return false; } - virtual int64 GetTotalReceivedBytes() const OVERRIDE { + virtual int64 GetTotalReceivedBytes() const override { ADD_FAILURE(); return 0; } virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE { + LoadTimingInfo* load_timing_info) const override { ADD_FAILURE(); return false; } - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual void GetSSLInfo(SSLInfo* ssl_info) override { ADD_FAILURE(); } virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE { + SSLCertRequestInfo* cert_request_info) override { ADD_FAILURE(); } - virtual bool IsSpdyHttpStream() const OVERRIDE { + virtual bool IsSpdyHttpStream() const override { ADD_FAILURE(); return false; } - virtual void Drain(HttpNetworkSession* session) OVERRIDE { + virtual void Drain(HttpNetworkSession* session) override { ADD_FAILURE(); } - virtual void SetPriority(RequestPriority priority) OVERRIDE { + virtual void SetPriority(RequestPriority priority) override { priority_ = priority; } @@ -12337,29 +12337,29 @@ class FakeStreamRequest : public HttpStreamRequest, } virtual int RestartTunnelWithProxyAuth( - const AuthCredentials& credentials) OVERRIDE { + const AuthCredentials& credentials) override { ADD_FAILURE(); return ERR_UNEXPECTED; } - virtual LoadState GetLoadState() const OVERRIDE { + virtual LoadState GetLoadState() const override { ADD_FAILURE(); return LoadState(); } - virtual void SetPriority(RequestPriority priority) OVERRIDE { + virtual void SetPriority(RequestPriority priority) override { priority_ = priority; } - virtual bool was_npn_negotiated() const OVERRIDE { + virtual bool was_npn_negotiated() const override { return false; } - virtual NextProto protocol_negotiated() const OVERRIDE { + virtual NextProto protocol_negotiated() const override { return kProtoUnknown; } - virtual bool using_spdy() const OVERRIDE { + virtual bool using_spdy() const override { return false; } @@ -12389,7 +12389,7 @@ class FakeStreamFactory : public HttpStreamFactory { const SSLConfig& server_ssl_config, const SSLConfig& proxy_ssl_config, HttpStreamRequest::Delegate* delegate, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { FakeStreamRequest* fake_request = new FakeStreamRequest(priority, delegate); last_stream_request_ = fake_request->AsWeakPtr(); return fake_request; @@ -12402,7 +12402,7 @@ class FakeStreamFactory : public HttpStreamFactory { const SSLConfig& proxy_ssl_config, HttpStreamRequest::Delegate* delegate, WebSocketHandshakeStreamBase::CreateHelper* create_helper, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { FakeStreamRequest* fake_request = new FakeStreamRequest(priority, delegate, create_helper); last_stream_request_ = fake_request->AsWeakPtr(); @@ -12413,11 +12413,11 @@ class FakeStreamFactory : public HttpStreamFactory { const HttpRequestInfo& info, RequestPriority priority, const SSLConfig& server_ssl_config, - const SSLConfig& proxy_ssl_config) OVERRIDE { + const SSLConfig& proxy_ssl_config) override { ADD_FAILURE(); } - virtual const HostMappingRules* GetHostMappingRules() const OVERRIDE { + virtual const HostMappingRules* GetHostMappingRules() const override { ADD_FAILURE(); return NULL; } @@ -12435,14 +12435,14 @@ class FakeWebSocketStreamCreateHelper : public: virtual WebSocketHandshakeStreamBase* CreateBasicStream( scoped_ptr<ClientSocketHandle> connection, - bool using_proxy) OVERRIDE { + bool using_proxy) override { NOTREACHED(); return NULL; } virtual WebSocketHandshakeStreamBase* CreateSpdyStream( const base::WeakPtr<SpdySession>& session, - bool use_relative_url) OVERRIDE { + bool use_relative_url) override { NOTREACHED(); return NULL; }; diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h index 6761621..87eeda4 100644 --- a/net/http/http_proxy_client_socket.h +++ b/net/http/http_proxy_client_socket.h @@ -55,39 +55,39 @@ class HttpProxyClientSocket : public ProxyClientSocket { virtual ~HttpProxyClientSocket(); // ProxyClientSocket implementation. - virtual const HttpResponseInfo* GetConnectResponseInfo() const OVERRIDE; - virtual HttpStream* CreateConnectResponseStream() OVERRIDE; - virtual int RestartWithAuth(const CompletionCallback& callback) OVERRIDE; + virtual const HttpResponseInfo* GetConnectResponseInfo() const override; + virtual HttpStream* CreateConnectResponseStream() override; + virtual int RestartWithAuth(const CompletionCallback& callback) override; virtual const scoped_refptr<HttpAuthController>& GetAuthController() const - OVERRIDE; - virtual bool IsUsingSpdy() const OVERRIDE; - virtual NextProto GetProtocolNegotiated() const OVERRIDE; + override; + virtual bool IsUsingSpdy() const override; + virtual NextProto GetProtocolNegotiated() const override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; private: enum State { diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h index 7ce0f37..9dac090 100644 --- a/net/http/http_proxy_client_socket_pool.h +++ b/net/http/http_proxy_client_socket_pool.h @@ -114,9 +114,9 @@ class HttpProxyConnectJob : public ConnectJob { virtual ~HttpProxyConnectJob(); // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; - virtual void GetAdditionalErrorState(ClientSocketHandle* handle) OVERRIDE; + virtual void GetAdditionalErrorState(ClientSocketHandle* handle) override; private: enum State { @@ -157,7 +157,7 @@ class HttpProxyConnectJob : public ConnectJob { // that the tunnel needs authentication credentials, the socket will be // returned in this case, and must be release back to the pool; or // a standard net error code will be returned. - virtual int ConnectInternal() OVERRIDE; + virtual int ConnectInternal() override; scoped_refptr<HttpProxySocketParams> params_; TransportClientSocketPool* const transport_pool_; @@ -205,51 +205,51 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE; + ClientSocketHandle* handle) override; virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE; + int id) override; - virtual void FlushWithError(int error) OVERRIDE; + virtual void FlushWithError(int error) override; - virtual void CloseIdleSockets() OVERRIDE; + virtual void CloseIdleSockets() override; - virtual int IdleSocketCount() const OVERRIDE; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; + bool include_nested_pools) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + virtual ClientSocketPoolHistograms* histograms() const override; // LowerLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; + virtual bool IsStalled() const override; - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; // HigherLayeredPool implementation. - virtual bool CloseOneIdleConnection() OVERRIDE; + virtual bool CloseOneIdleConnection() override; private: typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase; @@ -267,9 +267,9 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE; + ConnectJob::Delegate* delegate) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; private: TransportClientSocketPool* const transport_pool_; diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc index c6433af..98b7322 100644 --- a/net/http/http_proxy_client_socket_pool_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_unittest.cc @@ -66,7 +66,7 @@ class TestProxyDelegate : public ProxyDelegate { on_tunnel_headers_received_called_(false) { } - virtual ~TestProxyDelegate() OVERRIDE { + virtual ~TestProxyDelegate() override { } bool on_before_tunnel_request_called() const { @@ -92,21 +92,21 @@ class TestProxyDelegate : public ProxyDelegate { virtual void OnResolveProxy(const GURL& url, int load_flags, const ProxyService& proxy_service, - ProxyInfo* result) OVERRIDE { + ProxyInfo* result) override { } virtual void OnFallback(const ProxyServer& bad_proxy, - int net_error) OVERRIDE { + int net_error) override { } virtual void OnBeforeSendHeaders(URLRequest* request, const ProxyInfo& proxy_info, - HttpRequestHeaders* headers) OVERRIDE { + HttpRequestHeaders* headers) override { } virtual void OnBeforeTunnelRequest( const net::HostPortPair& proxy_server, - net::HttpRequestHeaders* extra_headers) OVERRIDE { + net::HttpRequestHeaders* extra_headers) override { on_before_tunnel_request_called_ = true; if (extra_headers) { extra_headers->SetHeader("Foo", proxy_server.ToString()); @@ -116,7 +116,7 @@ class TestProxyDelegate : public ProxyDelegate { virtual void OnTunnelHeadersReceived( const net::HostPortPair& origin, const net::HostPortPair& proxy_server, - const net::HttpResponseHeaders& response_headers) OVERRIDE { + const net::HttpResponseHeaders& response_headers) override { on_tunnel_headers_received_called_ = true; on_tunnel_headers_received_origin_ = origin; on_tunnel_headers_received_proxy_server_ = proxy_server; diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc index 5aa0bff..5a8713c 100644 --- a/net/http/http_response_body_drainer_unittest.cc +++ b/net/http/http_response_body_drainer_unittest.cc @@ -80,53 +80,53 @@ class MockHttpStream : public HttpStream { virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_UNEXPECTED; } virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_UNEXPECTED; } - virtual UploadProgress GetUploadProgress() const OVERRIDE { + virtual UploadProgress GetUploadProgress() const override { return UploadProgress(); } - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE { + virtual int ReadResponseHeaders(const CompletionCallback& callback) override { return ERR_UNEXPECTED; } - virtual bool CanFindEndOfResponse() const OVERRIDE { return true; } - virtual bool IsConnectionReused() const OVERRIDE { return false; } - virtual void SetConnectionReused() OVERRIDE {} - virtual bool IsConnectionReusable() const OVERRIDE { return false; } - virtual int64 GetTotalReceivedBytes() const OVERRIDE { return 0; } - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE {} + virtual bool CanFindEndOfResponse() const override { return true; } + virtual bool IsConnectionReused() const override { return false; } + virtual void SetConnectionReused() override {} + virtual bool IsConnectionReusable() const override { return false; } + virtual int64 GetTotalReceivedBytes() const override { return 0; } + virtual void GetSSLInfo(SSLInfo* ssl_info) override {} virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE {} + SSLCertRequestInfo* cert_request_info) override {} // Mocked API virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void Close(bool not_reusable) OVERRIDE { + const CompletionCallback& callback) override; + virtual void Close(bool not_reusable) override { CHECK(!closed_); closed_ = true; result_waiter_->set_result(not_reusable); } - virtual HttpStream* RenewStreamForAuth() OVERRIDE { + virtual HttpStream* RenewStreamForAuth() override { return NULL; } - virtual bool IsResponseBodyComplete() const OVERRIDE { return is_complete_; } + virtual bool IsResponseBodyComplete() const override { return is_complete_; } - virtual bool IsSpdyHttpStream() const OVERRIDE { return false; } + virtual bool IsSpdyHttpStream() const override { return false; } virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE { return false; } + LoadTimingInfo* load_timing_info) const override { return false; } - virtual void Drain(HttpNetworkSession*) OVERRIDE {} + virtual void Drain(HttpNetworkSession*) override {} - virtual void SetPriority(RequestPriority priority) OVERRIDE {} + virtual void SetPriority(RequestPriority priority) override {} // Methods to tweak/observer mock behavior: void set_stall_reads_forever() { stall_reads_forever_ = true; } diff --git a/net/http/http_server_properties_impl.h b/net/http/http_server_properties_impl.h index 03bb75f..b68db36 100644 --- a/net/http/http_server_properties_impl.h +++ b/net/http/http_server_properties_impl.h @@ -69,95 +69,95 @@ class NET_EXPORT HttpServerPropertiesImpl // ----------------------------- // Gets a weak pointer for this object. - virtual base::WeakPtr<HttpServerProperties> GetWeakPtr() OVERRIDE; + virtual base::WeakPtr<HttpServerProperties> GetWeakPtr() override; // Deletes all data. - virtual void Clear() OVERRIDE; + virtual void Clear() override; // Returns true if |server| supports SPDY. - virtual bool SupportsSpdy(const HostPortPair& server) OVERRIDE; + virtual bool SupportsSpdy(const HostPortPair& server) override; // Add |server| into the persistent store. virtual void SetSupportsSpdy(const HostPortPair& server, - bool support_spdy) OVERRIDE; + bool support_spdy) override; // Returns true if |server| has an Alternate-Protocol header. - virtual bool HasAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual bool HasAlternateProtocol(const HostPortPair& server) override; // Returns the Alternate-Protocol and port for |server|. // HasAlternateProtocol(server) must be true. virtual AlternateProtocolInfo GetAlternateProtocol( - const HostPortPair& server) OVERRIDE; + const HostPortPair& server) override; // Sets the Alternate-Protocol for |server|. virtual void SetAlternateProtocol( const HostPortPair& server, uint16 alternate_port, AlternateProtocol alternate_protocol, - double probability) OVERRIDE; + double probability) override; // Sets the Alternate-Protocol for |server| to be BROKEN. - virtual void SetBrokenAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual void SetBrokenAlternateProtocol(const HostPortPair& server) override; // Returns true if Alternate-Protocol for |server| was recently BROKEN. virtual bool WasAlternateProtocolRecentlyBroken( - const HostPortPair& server) OVERRIDE; + const HostPortPair& server) override; // Confirms that Alternate-Protocol for |server| is working. - virtual void ConfirmAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual void ConfirmAlternateProtocol(const HostPortPair& server) override; // Clears the Alternate-Protocol for |server|. - virtual void ClearAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual void ClearAlternateProtocol(const HostPortPair& server) override; // Returns all Alternate-Protocol mappings. - virtual const AlternateProtocolMap& alternate_protocol_map() const OVERRIDE; + virtual const AlternateProtocolMap& alternate_protocol_map() const override; virtual void SetAlternateProtocolExperiment( - AlternateProtocolExperiment experiment) OVERRIDE; + AlternateProtocolExperiment experiment) override; virtual void SetAlternateProtocolProbabilityThreshold( - double threshold) OVERRIDE; + double threshold) override; virtual AlternateProtocolExperiment GetAlternateProtocolExperiment() - const OVERRIDE; + const override; // Gets a reference to the SettingsMap stored for a host. // If no settings are stored, returns an empty SettingsMap. virtual const SettingsMap& GetSpdySettings( - const HostPortPair& host_port_pair) OVERRIDE; + const HostPortPair& host_port_pair) override; // Saves an individual SPDY setting for a host. Returns true if SPDY setting // is to be persisted. virtual bool SetSpdySetting(const HostPortPair& host_port_pair, SpdySettingsIds id, SpdySettingsFlags flags, - uint32 value) OVERRIDE; + uint32 value) override; // Clears all entries in |spdy_settings_map_| for a host. - virtual void ClearSpdySettings(const HostPortPair& host_port_pair) OVERRIDE; + virtual void ClearSpdySettings(const HostPortPair& host_port_pair) override; // Clears all entries in |spdy_settings_map_|. - virtual void ClearAllSpdySettings() OVERRIDE; + virtual void ClearAllSpdySettings() override; // Returns all persistent SPDY settings. - virtual const SpdySettingsMap& spdy_settings_map() const OVERRIDE; + virtual const SpdySettingsMap& spdy_settings_map() const override; // Methods for SupportsQuic. virtual SupportsQuic GetSupportsQuic( - const HostPortPair& host_port_pair) const OVERRIDE; + const HostPortPair& host_port_pair) const override; virtual void SetSupportsQuic(const HostPortPair& host_port_pair, bool used_quic, - const std::string& address) OVERRIDE; + const std::string& address) override; - virtual const SupportsQuicMap& supports_quic_map() const OVERRIDE; + virtual const SupportsQuicMap& supports_quic_map() const override; // Methods for NetworkStats. virtual void SetServerNetworkStats(const HostPortPair& host_port_pair, - NetworkStats stats) OVERRIDE; + NetworkStats stats) override; virtual const NetworkStats* GetServerNetworkStats( - const HostPortPair& host_port_pair) const OVERRIDE; + const HostPortPair& host_port_pair) const override; private: // |spdy_servers_map_| has flattened representation of servers (host, port) diff --git a/net/http/http_server_properties_manager.h b/net/http/http_server_properties_manager.h index 6c2a8f8..bcfe320 100644 --- a/net/http/http_server_properties_manager.h +++ b/net/http/http_server_properties_manager.h @@ -78,96 +78,96 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties { // ---------------------------------- // Gets a weak pointer for this object. - virtual base::WeakPtr<HttpServerProperties> GetWeakPtr() OVERRIDE; + virtual base::WeakPtr<HttpServerProperties> GetWeakPtr() override; // Deletes all data. Works asynchronously. - virtual void Clear() OVERRIDE; + virtual void Clear() override; // Returns true if |server| supports SPDY. Should only be called from IO // thread. - virtual bool SupportsSpdy(const HostPortPair& server) OVERRIDE; + virtual bool SupportsSpdy(const HostPortPair& server) override; // Add |server| as the SPDY server which supports SPDY protocol into the // persisitent store. Should only be called from IO thread. virtual void SetSupportsSpdy(const HostPortPair& server, - bool support_spdy) OVERRIDE; + bool support_spdy) override; // Returns true if |server| has an Alternate-Protocol header. - virtual bool HasAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual bool HasAlternateProtocol(const HostPortPair& server) override; // Returns the Alternate-Protocol and port for |server|. // HasAlternateProtocol(server) must be true. virtual AlternateProtocolInfo GetAlternateProtocol( - const HostPortPair& server) OVERRIDE; + const HostPortPair& server) override; // Sets the Alternate-Protocol for |server|. virtual void SetAlternateProtocol( const HostPortPair& server, uint16 alternate_port, AlternateProtocol alternate_protocol, - double alternate_probability) OVERRIDE; + double alternate_probability) override; // Sets the Alternate-Protocol for |server| to be BROKEN. - virtual void SetBrokenAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual void SetBrokenAlternateProtocol(const HostPortPair& server) override; // Returns true if Alternate-Protocol for |server| was recently BROKEN. virtual bool WasAlternateProtocolRecentlyBroken( - const HostPortPair& server) OVERRIDE; + const HostPortPair& server) override; // Confirms that Alternate-Protocol for |server| is working. - virtual void ConfirmAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual void ConfirmAlternateProtocol(const HostPortPair& server) override; // Clears the Alternate-Protocol for |server|. - virtual void ClearAlternateProtocol(const HostPortPair& server) OVERRIDE; + virtual void ClearAlternateProtocol(const HostPortPair& server) override; // Returns all Alternate-Protocol mappings. - virtual const AlternateProtocolMap& alternate_protocol_map() const OVERRIDE; + virtual const AlternateProtocolMap& alternate_protocol_map() const override; virtual void SetAlternateProtocolExperiment( - AlternateProtocolExperiment experiment) OVERRIDE; + AlternateProtocolExperiment experiment) override; virtual void SetAlternateProtocolProbabilityThreshold( - double threshold) OVERRIDE; + double threshold) override; virtual AlternateProtocolExperiment GetAlternateProtocolExperiment() - const OVERRIDE; + const override; // Gets a reference to the SettingsMap stored for a host. // If no settings are stored, returns an empty SettingsMap. virtual const SettingsMap& GetSpdySettings( - const HostPortPair& host_port_pair) OVERRIDE; + const HostPortPair& host_port_pair) override; // Saves an individual SPDY setting for a host. Returns true if SPDY setting // is to be persisted. virtual bool SetSpdySetting(const HostPortPair& host_port_pair, SpdySettingsIds id, SpdySettingsFlags flags, - uint32 value) OVERRIDE; + uint32 value) override; // Clears all SPDY settings for a host. - virtual void ClearSpdySettings(const HostPortPair& host_port_pair) OVERRIDE; + virtual void ClearSpdySettings(const HostPortPair& host_port_pair) override; // Clears all SPDY settings for all hosts. - virtual void ClearAllSpdySettings() OVERRIDE; + virtual void ClearAllSpdySettings() override; // Returns all SPDY persistent settings. - virtual const SpdySettingsMap& spdy_settings_map() const OVERRIDE; + virtual const SpdySettingsMap& spdy_settings_map() const override; // Methods for SupportsQuic. virtual SupportsQuic GetSupportsQuic( - const HostPortPair& host_port_pair) const OVERRIDE; + const HostPortPair& host_port_pair) const override; virtual void SetSupportsQuic(const HostPortPair& host_port_pair, bool used_quic, - const std::string& address) OVERRIDE; + const std::string& address) override; - virtual const SupportsQuicMap& supports_quic_map() const OVERRIDE; + virtual const SupportsQuicMap& supports_quic_map() const override; virtual void SetServerNetworkStats(const HostPortPair& host_port_pair, - NetworkStats stats) OVERRIDE; + NetworkStats stats) override; virtual const NetworkStats* GetServerNetworkStats( - const HostPortPair& host_port_pair) const OVERRIDE; + const HostPortPair& host_port_pair) const override; protected: // -------------------- diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 012a46d..dbbfc2d 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc @@ -44,7 +44,7 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager { // Post tasks without a delay during tests. virtual void StartPrefsUpdateTimerOnNetworkThread( - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { HttpServerPropertiesManager::StartPrefsUpdateTimerOnNetworkThread( base::TimeDelta()); } @@ -55,7 +55,7 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager { // Post tasks without a delay during tests. virtual void StartCacheUpdateTimerOnPrefThread( - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { HttpServerPropertiesManager::StartCacheUpdateTimerOnPrefThread( base::TimeDelta()); } @@ -88,7 +88,7 @@ class HttpServerPropertiesManagerTest : public testing::Test { protected: HttpServerPropertiesManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { pref_service_.registry()->RegisterDictionaryPref(kTestHttpServerProperties); http_server_props_manager_.reset( new StrictMock<TestingHttpServerPropertiesManager>( @@ -99,7 +99,7 @@ class HttpServerPropertiesManagerTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (http_server_props_manager_.get()) http_server_props_manager_->ShutdownOnPrefThread(); base::RunLoop().RunUntilIdle(); diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h index 7df0a67..91a59c2 100644 --- a/net/http/http_stream_factory_impl.h +++ b/net/http/http_stream_factory_impl.h @@ -38,7 +38,7 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory { const SSLConfig& server_ssl_config, const SSLConfig& proxy_ssl_config, HttpStreamRequest::Delegate* delegate, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual HttpStreamRequest* RequestWebSocketHandshakeStream( const HttpRequestInfo& info, @@ -47,14 +47,14 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory { const SSLConfig& proxy_ssl_config, HttpStreamRequest::Delegate* delegate, WebSocketHandshakeStreamBase::CreateHelper* create_helper, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void PreconnectStreams(int num_streams, const HttpRequestInfo& info, RequestPriority priority, const SSLConfig& server_ssl_config, - const SSLConfig& proxy_ssl_config) OVERRIDE; - virtual const HostMappingRules* GetHostMappingRules() const OVERRIDE; + const SSLConfig& proxy_ssl_config) override; + virtual const HostMappingRules* GetHostMappingRules() const override; size_t num_orphaned_jobs() const { return orphaned_job_set_.size(); } diff --git a/net/http/http_stream_factory_impl_request.h b/net/http/http_stream_factory_impl_request.h index eafc138..3ab7d95 100644 --- a/net/http/http_stream_factory_impl_request.h +++ b/net/http/http_stream_factory_impl_request.h @@ -99,12 +99,12 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest { // HttpStreamRequest methods. virtual int RestartTunnelWithProxyAuth( - const AuthCredentials& credentials) OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; - virtual LoadState GetLoadState() const OVERRIDE; - virtual bool was_npn_negotiated() const OVERRIDE; - virtual NextProto protocol_negotiated() const OVERRIDE; - virtual bool using_spdy() const OVERRIDE; + const AuthCredentials& credentials) override; + virtual void SetPriority(RequestPriority priority) override; + virtual LoadState GetLoadState() const override; + virtual bool was_npn_negotiated() const override; + virtual NextProto protocol_negotiated() const override; + virtual bool using_spdy() const override; private: // Used to orphan all jobs in |jobs_| other than |job| which becomes "bound" diff --git a/net/http/http_stream_factory_impl_request_unittest.cc b/net/http/http_stream_factory_impl_request_unittest.cc index eea2a1b..422abd0 100644 --- a/net/http/http_stream_factory_impl_request_unittest.cc +++ b/net/http/http_stream_factory_impl_request_unittest.cc @@ -34,28 +34,28 @@ class DoNothingRequestDelegate : public HttpStreamRequest::Delegate { virtual void OnStreamReady( const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpStreamBase* stream) OVERRIDE {} + HttpStreamBase* stream) override {} virtual void OnWebSocketHandshakeStreamReady( const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - WebSocketHandshakeStreamBase* stream) OVERRIDE {} + WebSocketHandshakeStreamBase* stream) override {} virtual void OnStreamFailed( int status, - const SSLConfig& used_ssl_config) OVERRIDE {} + const SSLConfig& used_ssl_config) override {} virtual void OnCertificateError( int status, const SSLConfig& used_ssl_config, - const SSLInfo& ssl_info) OVERRIDE {} + const SSLInfo& ssl_info) override {} virtual void OnNeedsProxyAuth(const HttpResponseInfo& proxy_response, const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpAuthController* auth_controller) OVERRIDE {} + HttpAuthController* auth_controller) override {} virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config, - SSLCertRequestInfo* cert_info) OVERRIDE {} + SSLCertRequestInfo* cert_info) override {} virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info, const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpStreamBase* stream) OVERRIDE {} + HttpStreamBase* stream) override {} }; } // namespace diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc index c56abfd..a93e9b0 100644 --- a/net/http/http_stream_factory_impl_unittest.cc +++ b/net/http/http_stream_factory_impl_unittest.cc @@ -62,41 +62,41 @@ class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase { virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE { + virtual int ReadResponseHeaders(const CompletionCallback& callback) override { return ERR_IO_PENDING; } virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } - virtual void Close(bool not_reusable) OVERRIDE {} - virtual bool IsResponseBodyComplete() const OVERRIDE { return false; } - virtual bool CanFindEndOfResponse() const OVERRIDE { return false; } - virtual bool IsConnectionReused() const OVERRIDE { return false; } - virtual void SetConnectionReused() OVERRIDE {} - virtual bool IsConnectionReusable() const OVERRIDE { return false; } - virtual int64 GetTotalReceivedBytes() const OVERRIDE { return 0; } + virtual void Close(bool not_reusable) override {} + virtual bool IsResponseBodyComplete() const override { return false; } + virtual bool CanFindEndOfResponse() const override { return false; } + virtual bool IsConnectionReused() const override { return false; } + virtual void SetConnectionReused() override {} + virtual bool IsConnectionReusable() const override { return false; } + virtual int64 GetTotalReceivedBytes() const override { return 0; } virtual bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const - OVERRIDE { + override { return false; } - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE {} + virtual void GetSSLInfo(SSLInfo* ssl_info) override {} virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE {} - virtual bool IsSpdyHttpStream() const OVERRIDE { return false; } - virtual void Drain(HttpNetworkSession* session) OVERRIDE {} - virtual void SetPriority(RequestPriority priority) OVERRIDE {} + SSLCertRequestInfo* cert_request_info) override {} + virtual bool IsSpdyHttpStream() const override { return false; } + virtual void Drain(HttpNetworkSession* session) override {} + virtual void SetPriority(RequestPriority priority) override {} - virtual scoped_ptr<WebSocketStream> Upgrade() OVERRIDE { + virtual scoped_ptr<WebSocketStream> Upgrade() override { return scoped_ptr<WebSocketStream>(); } @@ -124,7 +124,7 @@ class MockHttpStreamFactoryImplForPreconnect : public HttpStreamFactoryImpl { private: // HttpStreamFactoryImpl methods. - virtual void OnPreconnectsCompleteInternal() OVERRIDE { + virtual void OnPreconnectsCompleteInternal() override { preconnect_done_ = true; if (waiting_for_preconnect_) base::MessageLoop::current()->Quit(); @@ -145,7 +145,7 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate { virtual void OnStreamReady( const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpStreamBase* stream) OVERRIDE { + HttpStreamBase* stream) override { stream_done_ = true; if (waiting_for_stream_) base::MessageLoop::current()->Quit(); @@ -157,7 +157,7 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate { virtual void OnWebSocketHandshakeStreamReady( const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - WebSocketHandshakeStreamBase* stream) OVERRIDE { + WebSocketHandshakeStreamBase* stream) override { stream_done_ = true; if (waiting_for_stream_) base::MessageLoop::current()->Quit(); @@ -168,25 +168,25 @@ class StreamRequestWaiter : public HttpStreamRequest::Delegate { virtual void OnStreamFailed( int status, - const SSLConfig& used_ssl_config) OVERRIDE {} + const SSLConfig& used_ssl_config) override {} virtual void OnCertificateError( int status, const SSLConfig& used_ssl_config, - const SSLInfo& ssl_info) OVERRIDE {} + const SSLInfo& ssl_info) override {} virtual void OnNeedsProxyAuth(const HttpResponseInfo& proxy_response, const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpAuthController* auth_controller) OVERRIDE {} + HttpAuthController* auth_controller) override {} virtual void OnNeedsClientAuth(const SSLConfig& used_ssl_config, - SSLCertRequestInfo* cert_info) OVERRIDE {} + SSLCertRequestInfo* cert_info) override {} virtual void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info, const SSLConfig& used_ssl_config, const ProxyInfo& used_proxy_info, - HttpStreamBase* stream) OVERRIDE {} + HttpStreamBase* stream) override {} void WaitForStream() { while (!stream_done_) { @@ -264,13 +264,13 @@ class WebSocketStreamCreateHelper virtual WebSocketHandshakeStreamBase* CreateBasicStream( scoped_ptr<ClientSocketHandle> connection, - bool using_proxy) OVERRIDE { + bool using_proxy) override { return new WebSocketBasicHandshakeStream(connection.Pass()); } virtual WebSocketHandshakeStreamBase* CreateSpdyStream( const base::WeakPtr<SpdySession>& spdy_session, - bool use_relative_url) OVERRIDE { + bool use_relative_url) override { return new WebSocketSpdyHandshakeStream(spdy_session); } }; @@ -329,7 +329,7 @@ class CapturePreconnectsSocketPool : public ParentPool { RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { ADD_FAILURE(); return ERR_UNEXPECTED; } @@ -337,38 +337,38 @@ class CapturePreconnectsSocketPool : public ParentPool { virtual void RequestSockets(const std::string& group_name, const void* socket_params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { last_num_streams_ = num_sockets; } virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE { + ClientSocketHandle* handle) override { ADD_FAILURE(); } virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE { + int id) override { ADD_FAILURE(); } - virtual void CloseIdleSockets() OVERRIDE { + virtual void CloseIdleSockets() override { ADD_FAILURE(); } - virtual int IdleSocketCount() const OVERRIDE { + virtual int IdleSocketCount() const override { ADD_FAILURE(); return 0; } virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE { + const std::string& group_name) const override { ADD_FAILURE(); return 0; } virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE { + const ClientSocketHandle* handle) const override { ADD_FAILURE(); return LOAD_STATE_IDLE; } - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE { + virtual base::TimeDelta ConnectionTimeout() const override { return base::TimeDelta(); } diff --git a/net/http/http_transaction_test_util.h b/net/http/http_transaction_test_util.h index b8663c6..e0f5bda 100644 --- a/net/http/http_transaction_test_util.h +++ b/net/http/http_transaction_test_util.h @@ -172,57 +172,57 @@ class MockNetworkTransaction virtual int Start(const net::HttpRequestInfo* request, const net::CompletionCallback& callback, - const net::BoundNetLog& net_log) OVERRIDE; + const net::BoundNetLog& net_log) override; virtual int RestartIgnoringLastError( - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int RestartWithCertificate( net::X509Certificate* client_cert, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int RestartWithAuth( const net::AuthCredentials& credentials, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; - virtual bool IsReadyToRestartForAuth() OVERRIDE; + virtual bool IsReadyToRestartForAuth() override; virtual int Read(net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; - virtual void StopCaching() OVERRIDE; + virtual void StopCaching() override; virtual bool GetFullRequestHeaders( - net::HttpRequestHeaders* headers) const OVERRIDE; + net::HttpRequestHeaders* headers) const override; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; + virtual int64 GetTotalReceivedBytes() const override; - virtual void DoneReading() OVERRIDE; + virtual void DoneReading() override; - virtual const net::HttpResponseInfo* GetResponseInfo() const OVERRIDE; + virtual const net::HttpResponseInfo* GetResponseInfo() const override; - virtual net::LoadState GetLoadState() const OVERRIDE; + virtual net::LoadState GetLoadState() const override; - virtual net::UploadProgress GetUploadProgress() const OVERRIDE; + virtual net::UploadProgress GetUploadProgress() const override; virtual void SetQuicServerInfo( - net::QuicServerInfo* quic_server_info) OVERRIDE; + net::QuicServerInfo* quic_server_info) override; virtual bool GetLoadTimingInfo( - net::LoadTimingInfo* load_timing_info) const OVERRIDE; + net::LoadTimingInfo* load_timing_info) const override; - virtual void SetPriority(net::RequestPriority priority) OVERRIDE; + virtual void SetPriority(net::RequestPriority priority) override; virtual void SetWebSocketHandshakeStreamCreateHelper( - CreateHelper* create_helper) OVERRIDE; + CreateHelper* create_helper) override; virtual void SetBeforeNetworkStartCallback( - const BeforeNetworkStartCallback& callback) OVERRIDE; + const BeforeNetworkStartCallback& callback) override; virtual void SetBeforeProxyHeadersSentCallback( - const BeforeProxyHeadersSentCallback& callback) OVERRIDE; + const BeforeProxyHeadersSentCallback& callback) override; - virtual int ResumeNetworkStart() OVERRIDE; + virtual int ResumeNetworkStart() override; CreateHelper* websocket_handshake_stream_create_helper() { return websocket_handshake_stream_create_helper_; @@ -292,9 +292,9 @@ class MockNetworkLayer : public net::HttpTransactionFactory, // net::HttpTransactionFactory: virtual int CreateTransaction( net::RequestPriority priority, - scoped_ptr<net::HttpTransaction>* trans) OVERRIDE; - virtual net::HttpCache* GetCache() OVERRIDE; - virtual net::HttpNetworkSession* GetSession() OVERRIDE; + scoped_ptr<net::HttpTransaction>* trans) override; + virtual net::HttpCache* GetCache() override; + virtual net::HttpNetworkSession* GetSession() override; private: int transaction_count_; diff --git a/net/http/mock_allow_url_security_manager.h b/net/http/mock_allow_url_security_manager.h index 8fbe2c5..3e19f9b 100644 --- a/net/http/mock_allow_url_security_manager.h +++ b/net/http/mock_allow_url_security_manager.h @@ -16,8 +16,8 @@ class MockAllowURLSecurityManager : public URLSecurityManager { MockAllowURLSecurityManager(); virtual ~MockAllowURLSecurityManager(); - virtual bool CanUseDefaultCredentials(const GURL& auth_origin) const OVERRIDE; - virtual bool CanDelegate(const GURL& auth_origin) const OVERRIDE; + virtual bool CanUseDefaultCredentials(const GURL& auth_origin) const override; + virtual bool CanDelegate(const GURL& auth_origin) const override; private: DISALLOW_COPY_AND_ASSIGN(MockAllowURLSecurityManager); diff --git a/net/http/mock_gssapi_library_posix.h b/net/http/mock_gssapi_library_posix.h index faecdd4..cbd35e5 100644 --- a/net/http/mock_gssapi_library_posix.h +++ b/net/http/mock_gssapi_library_posix.h @@ -122,32 +122,32 @@ class MockGSSAPILibrary : public GSSAPILibrary { // Initializes the library, including any necessary dynamic libraries. // This is done separately from construction (which happens at startup time) // in order to delay work until the class is actually needed. - virtual bool Init() OVERRIDE; + virtual bool Init() override; // These methods match the ones in the GSSAPI library. virtual OM_uint32 import_name( OM_uint32* minor_status, const gss_buffer_t input_name_buffer, const gss_OID input_name_type, - gss_name_t* output_name) OVERRIDE; + gss_name_t* output_name) override; virtual OM_uint32 release_name( OM_uint32* minor_status, - gss_name_t* input_name) OVERRIDE; + gss_name_t* input_name) override; virtual OM_uint32 release_buffer( OM_uint32* minor_status, - gss_buffer_t buffer) OVERRIDE; + gss_buffer_t buffer) override; virtual OM_uint32 display_name( OM_uint32* minor_status, const gss_name_t input_name, gss_buffer_t output_name_buffer, - gss_OID* output_name_type) OVERRIDE; + gss_OID* output_name_type) override; virtual OM_uint32 display_status( OM_uint32* minor_status, OM_uint32 status_value, int status_type, const gss_OID mech_type, OM_uint32* message_contex, - gss_buffer_t status_string) OVERRIDE; + gss_buffer_t status_string) override; virtual OM_uint32 init_sec_context( OM_uint32* minor_status, const gss_cred_id_t initiator_cred_handle, @@ -161,18 +161,18 @@ class MockGSSAPILibrary : public GSSAPILibrary { gss_OID* actual_mech_type, gss_buffer_t output_token, OM_uint32* ret_flags, - OM_uint32* time_rec) OVERRIDE; + OM_uint32* time_rec) override; virtual OM_uint32 wrap_size_limit( OM_uint32* minor_status, const gss_ctx_id_t context_handle, int conf_req_flag, gss_qop_t qop_req, OM_uint32 req_output_size, - OM_uint32* max_input_size) OVERRIDE; + OM_uint32* max_input_size) override; virtual OM_uint32 delete_sec_context( OM_uint32* minor_status, gss_ctx_id_t* context_handle, - gss_buffer_t output_token) OVERRIDE; + gss_buffer_t output_token) override; virtual OM_uint32 inquire_context( OM_uint32* minor_status, const gss_ctx_id_t context_handle, @@ -182,7 +182,7 @@ class MockGSSAPILibrary : public GSSAPILibrary { gss_OID* mech_type, OM_uint32* ctx_flags, int* locally_initiated, - int* open) OVERRIDE; + int* open) override; private: FRIEND_TEST_ALL_PREFIXES(HttpAuthGSSAPIPOSIXTest, GSSAPICycle); diff --git a/net/http/mock_http_cache.cc b/net/http/mock_http_cache.cc index cbae9b8..325454e 100644 --- a/net/http/mock_http_cache.cc +++ b/net/http/mock_http_cache.cc @@ -460,7 +460,7 @@ int MockDiskCache::DoomEntriesSince(const base::Time initial_time, class MockDiskCache::NotImplementedIterator : public Iterator { public: virtual int OpenNextEntry(disk_cache::Entry** next_entry, - const net::CompletionCallback& callback) OVERRIDE { + const net::CompletionCallback& callback) override { return net::ERR_NOT_IMPLEMENTED; } }; diff --git a/net/http/mock_http_cache.h b/net/http/mock_http_cache.h index ab63b11..9b2caf5 100644 --- a/net/http/mock_http_cache.h +++ b/net/http/mock_http_cache.h @@ -25,29 +25,29 @@ class MockDiskEntry : public disk_cache::Entry, bool is_doomed() const { return doomed_; } - virtual void Doom() OVERRIDE; - virtual void Close() OVERRIDE; - virtual std::string GetKey() const OVERRIDE; - virtual base::Time GetLastUsed() const OVERRIDE; - virtual base::Time GetLastModified() const OVERRIDE; - virtual int32 GetDataSize(int index) const OVERRIDE; + virtual void Doom() override; + virtual void Close() override; + virtual std::string GetKey() const override; + virtual base::Time GetLastUsed() const override; + virtual base::Time GetLastModified() const override; + virtual int32 GetDataSize(int index) const override; virtual int ReadData(int index, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback, - bool truncate) OVERRIDE; + bool truncate) override; virtual int ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int WriteSparseData( int64 offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int GetAvailableRange( int64 offset, int len, int64* start, - const net::CompletionCallback& callback) OVERRIDE; - virtual bool CouldBeSparse() const OVERRIDE; - virtual void CancelSparseIO() OVERRIDE; + const net::CompletionCallback& callback) override; + virtual bool CouldBeSparse() const override; + virtual void CancelSparseIO() override; virtual int ReadyForSparseIO( - const net::CompletionCallback& completion_callback) OVERRIDE; + const net::CompletionCallback& completion_callback) override; // Fail most subsequent requests. void set_fail_requests() { fail_requests_ = true; } @@ -98,26 +98,26 @@ class MockDiskCache : public disk_cache::Backend { MockDiskCache(); virtual ~MockDiskCache(); - virtual net::CacheType GetCacheType() const OVERRIDE; - virtual int32 GetEntryCount() const OVERRIDE; + virtual net::CacheType GetCacheType() const override; + virtual int32 GetEntryCount() const override; virtual int OpenEntry(const std::string& key, disk_cache::Entry** entry, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int DoomEntry(const std::string& key, - const net::CompletionCallback& callback) OVERRIDE; - virtual int DoomAllEntries(const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; + virtual int DoomAllEntries(const net::CompletionCallback& callback) override; virtual int DoomEntriesBetween( base::Time initial_time, base::Time end_time, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int DoomEntriesSince( base::Time initial_time, - const net::CompletionCallback& callback) OVERRIDE; - virtual scoped_ptr<Iterator> CreateIterator() OVERRIDE; + const net::CompletionCallback& callback) override; + virtual scoped_ptr<Iterator> CreateIterator() override; virtual void GetStats( - std::vector<std::pair<std::string, std::string> >* stats) OVERRIDE; - virtual void OnExternalCacheHit(const std::string& key) OVERRIDE; + std::vector<std::pair<std::string, std::string> >* stats) override; + virtual void OnExternalCacheHit(const std::string& key) override; // Returns number of times a cache entry was successfully opened. int open_count() const { return open_count_; } @@ -158,7 +158,7 @@ class MockBackendFactory : public net::HttpCache::BackendFactory { public: virtual int CreateBackend(net::NetLog* net_log, scoped_ptr<disk_cache::Backend>* backend, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; }; class MockHttpCache { @@ -211,14 +211,14 @@ class MockHttpCache { // This version of the disk cache doesn't invoke CreateEntry callbacks. class MockDiskCacheNoCB : public MockDiskCache { virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; }; class MockBackendNoCbFactory : public net::HttpCache::BackendFactory { public: virtual int CreateBackend(net::NetLog* net_log, scoped_ptr<disk_cache::Backend>* backend, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; }; // This backend factory allows us to control the backend instantiation. @@ -229,7 +229,7 @@ class MockBlockingBackendFactory : public net::HttpCache::BackendFactory { virtual int CreateBackend(net::NetLog* net_log, scoped_ptr<disk_cache::Backend>* backend, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; // Completes the backend creation. Any blocked call will be notified via the // provided callback. diff --git a/net/http/proxy_connect_redirect_http_stream.h b/net/http/proxy_connect_redirect_http_stream.h index f848c64..ddaf9b7 100644 --- a/net/http/proxy_connect_redirect_http_stream.h +++ b/net/http/proxy_connect_redirect_http_stream.h @@ -28,44 +28,44 @@ class ProxyConnectRedirectHttpStream : public HttpStream { virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE; - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual int ReadResponseHeaders(const CompletionCallback& callback) override; virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // This function may be called. - virtual void Close(bool not_reusable) OVERRIDE; + virtual void Close(bool not_reusable) override; - virtual bool IsResponseBodyComplete() const OVERRIDE; + virtual bool IsResponseBodyComplete() const override; // This function may be called. - virtual bool CanFindEndOfResponse() const OVERRIDE; + virtual bool CanFindEndOfResponse() const override; - virtual bool IsConnectionReused() const OVERRIDE; - virtual void SetConnectionReused() OVERRIDE; - virtual bool IsConnectionReusable() const OVERRIDE; + virtual bool IsConnectionReused() const override; + virtual void SetConnectionReused() override; + virtual bool IsConnectionReusable() const override; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; + virtual int64 GetTotalReceivedBytes() const override; // This function may be called. virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; + LoadTimingInfo* load_timing_info) const override; - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual void GetSSLInfo(SSLInfo* ssl_info) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual bool IsSpdyHttpStream() const OVERRIDE; - virtual void Drain(HttpNetworkSession* session) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual bool IsSpdyHttpStream() const override; + virtual void Drain(HttpNetworkSession* session) override; // This function may be called. - virtual void SetPriority(RequestPriority priority) OVERRIDE; + virtual void SetPriority(RequestPriority priority) override; - virtual UploadProgress GetUploadProgress() const OVERRIDE; - virtual HttpStream* RenewStreamForAuth() OVERRIDE; + virtual UploadProgress GetUploadProgress() const override; + virtual HttpStream* RenewStreamForAuth() override; private: bool has_load_timing_info_; diff --git a/net/http/transport_security_persister.h b/net/http/transport_security_persister.h index 79a0d7a..5081c38 100644 --- a/net/http/transport_security_persister.h +++ b/net/http/transport_security_persister.h @@ -65,7 +65,7 @@ class NET_EXPORT TransportSecurityPersister virtual ~TransportSecurityPersister(); // Called by the TransportSecurityState when it changes its state. - virtual void StateIsDirty(TransportSecurityState*) OVERRIDE; + virtual void StateIsDirty(TransportSecurityState*) override; // ImportantFileWriter::DataSerializer: // @@ -97,7 +97,7 @@ class NET_EXPORT TransportSecurityPersister // The reason for hashing them is so that the stored state does not // trivially reveal a user's browsing history to an attacker reading the // serialized state on disk. - virtual bool SerializeData(std::string* data) OVERRIDE; + virtual bool SerializeData(std::string* data) override; // Clears any existing non-static entries, and then re-populates // |transport_security_state_|. diff --git a/net/http/transport_security_persister_unittest.cc b/net/http/transport_security_persister_unittest.cc index f4d49f7..b8dad5a 100644 --- a/net/http/transport_security_persister_unittest.cc +++ b/net/http/transport_security_persister_unittest.cc @@ -27,7 +27,7 @@ class TransportSecurityPersisterTest : public testing::Test { base::MessageLoopForIO::current()->RunUntilIdle(); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); persister_.reset(new TransportSecurityPersister( &state_, diff --git a/net/http/url_security_manager.h b/net/http/url_security_manager.h index 4015fc2..2835d89 100644 --- a/net/http/url_security_manager.h +++ b/net/http/url_security_manager.h @@ -64,8 +64,8 @@ class URLSecurityManagerWhitelist : public URLSecurityManager { virtual ~URLSecurityManagerWhitelist(); // URLSecurityManager methods. - virtual bool CanUseDefaultCredentials(const GURL& auth_origin) const OVERRIDE; - virtual bool CanDelegate(const GURL& auth_origin) const OVERRIDE; + virtual bool CanUseDefaultCredentials(const GURL& auth_origin) const override; + virtual bool CanDelegate(const GURL& auth_origin) const override; private: scoped_ptr<const HttpAuthFilter> whitelist_default_; diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index 1d7fa9d..844816e 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -285,7 +285,7 @@ class OCSPRequestSession virtual void OnReceivedRedirect(URLRequest* request, const RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { DCHECK_EQ(request_.get(), request); DCHECK_EQ(base::MessageLoopForIO::current(), io_loop_); @@ -296,7 +296,7 @@ class OCSPRequestSession } } - virtual void OnResponseStarted(URLRequest* request) OVERRIDE { + virtual void OnResponseStarted(URLRequest* request) override { DCHECK_EQ(request_.get(), request); DCHECK_EQ(base::MessageLoopForIO::current(), io_loop_); @@ -311,7 +311,7 @@ class OCSPRequestSession } virtual void OnReadCompleted(URLRequest* request, - int bytes_read) OVERRIDE { + int bytes_read) override { DCHECK_EQ(request_.get(), request); DCHECK_EQ(base::MessageLoopForIO::current(), io_loop_); diff --git a/net/ocsp/nss_ocsp_unittest.cc b/net/ocsp/nss_ocsp_unittest.cc index 0201ad1..3df446e 100644 --- a/net/ocsp/nss_ocsp_unittest.cc +++ b/net/ocsp/nss_ocsp_unittest.cc @@ -49,7 +49,7 @@ class AiaResponseHandler : public net::URLRequestInterceptor { // net::URLRequestInterceptor implementation: virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { ++const_cast<AiaResponseHandler*>(this)->request_count_; return new net::URLRequestTestJob( diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc index 821e4eb..8e19001 100644 --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc @@ -51,7 +51,7 @@ class MockDhcpProxyScriptAdapterFetcher fetcher_ = NULL; } - virtual ProxyScriptFetcher* ImplCreateScriptFetcher() OVERRIDE { + virtual ProxyScriptFetcher* ImplCreateScriptFetcher() override { // We don't maintain ownership of the fetcher, it is transferred to // the caller. fetcher_ = new MockProxyScriptFetcher(); @@ -71,7 +71,7 @@ class MockDhcpProxyScriptAdapterFetcher } std::string ImplGetPacURLFromDhcp( - const std::string& adapter_name) OVERRIDE { + const std::string& adapter_name) override { base::ElapsedTimer timer; test_finished_event_.TimedWait(dhcp_delay_); return configured_url_; @@ -82,7 +82,7 @@ class MockDhcpProxyScriptAdapterFetcher std::string configured_url_; }; - virtual DhcpQuery* ImplCreateDhcpQuery() OVERRIDE { + virtual DhcpQuery* ImplCreateDhcpQuery() override { dhcp_query_ = new DelayingDhcpQuery(); dhcp_query_->dhcp_delay_ = dhcp_delay_; dhcp_query_->configured_url_ = configured_url_; @@ -90,7 +90,7 @@ class MockDhcpProxyScriptAdapterFetcher } // Use a shorter timeout so tests can finish more quickly. - virtual base::TimeDelta ImplGetTimeout() const OVERRIDE { + virtual base::TimeDelta ImplGetTimeout() const override { return timeout_; } @@ -272,7 +272,7 @@ class MockDhcpRealFetchProxyScriptAdapterFetcher } // Returns a real proxy script fetcher. - ProxyScriptFetcher* ImplCreateScriptFetcher() OVERRIDE { + ProxyScriptFetcher* ImplCreateScriptFetcher() override { ProxyScriptFetcher* fetcher = new ProxyScriptFetcherImpl(url_request_context_); return fetcher; diff --git a/net/proxy/dhcp_proxy_script_fetcher.h b/net/proxy/dhcp_proxy_script_fetcher.h index 0ec2ed4..bb293de 100644 --- a/net/proxy/dhcp_proxy_script_fetcher.h +++ b/net/proxy/dhcp_proxy_script_fetcher.h @@ -86,9 +86,9 @@ class NET_EXPORT_PRIVATE DoNothingDhcpProxyScriptFetcher virtual ~DoNothingDhcpProxyScriptFetcher(); virtual int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual const GURL& GetPacURL() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Cancel() override; + virtual const GURL& GetPacURL() const override; private: GURL gurl_; DISALLOW_COPY_AND_ASSIGN(DoNothingDhcpProxyScriptFetcher); diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.h b/net/proxy/dhcp_proxy_script_fetcher_win.h index d6f14f9..1122997 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_win.h +++ b/net/proxy/dhcp_proxy_script_fetcher_win.h @@ -39,10 +39,10 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptFetcherWin // DhcpProxyScriptFetcher implementation. int Fetch(base::string16* utf16_text, - const net::CompletionCallback& callback) OVERRIDE; - void Cancel() OVERRIDE; - const GURL& GetPacURL() const OVERRIDE; - std::string GetFetcherName() const OVERRIDE; + const net::CompletionCallback& callback) override; + void Cancel() override; + const GURL& GetPacURL() const override; + std::string GetFetcherName() const override; // Sets |adapter_names| to contain the name of each network adapter on // this machine that has DHCP enabled and is not a loop-back adapter. Returns diff --git a/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc index 743fb26..eb98330 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc +++ b/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc @@ -169,13 +169,13 @@ class DelayingDhcpProxyScriptAdapterFetcher } std::string ImplGetPacURLFromDhcp( - const std::string& adapter_name) OVERRIDE { + const std::string& adapter_name) override { base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(20)); return DhcpQuery::ImplGetPacURLFromDhcp(adapter_name); } }; - DhcpQuery* ImplCreateDhcpQuery() OVERRIDE { + DhcpQuery* ImplCreateDhcpQuery() override { return new DelayingDhcpQuery(); } }; @@ -189,7 +189,7 @@ class DelayingDhcpProxyScriptFetcherWin : DhcpProxyScriptFetcherWin(context) { } - DhcpProxyScriptAdapterFetcher* ImplCreateAdapterFetcher() OVERRIDE { + DhcpProxyScriptAdapterFetcher* ImplCreateAdapterFetcher() override { return new DelayingDhcpProxyScriptAdapterFetcher(url_request_context(), GetTaskRunner()); } @@ -224,25 +224,25 @@ class DummyDhcpProxyScriptAdapterFetcher } void Fetch(const std::string& adapter_name, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { callback_ = callback; timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(fetch_delay_ms_), this, &DummyDhcpProxyScriptAdapterFetcher::OnTimer); } - void Cancel() OVERRIDE { + void Cancel() override { timer_.Stop(); } - bool DidFinish() const OVERRIDE { + bool DidFinish() const override { return did_finish_; } - int GetResult() const OVERRIDE { + int GetResult() const override { return result_; } - base::string16 GetPacScript() const OVERRIDE { + base::string16 GetPacScript() const override { return pac_script_; } @@ -280,7 +280,7 @@ class MockDhcpProxyScriptFetcherWin : public DhcpProxyScriptFetcherWin { } virtual bool ImplGetCandidateAdapterNames( - std::set<std::string>* adapter_names) OVERRIDE { + std::set<std::string>* adapter_names) override { adapter_names->insert( mock_adapter_names_.begin(), mock_adapter_names_.end()); return true; @@ -324,21 +324,21 @@ class MockDhcpProxyScriptFetcherWin : public DhcpProxyScriptFetcherWin { PushBackAdapter(adapter_name, adapter_fetcher.release()); } - DhcpProxyScriptAdapterFetcher* ImplCreateAdapterFetcher() OVERRIDE { + DhcpProxyScriptAdapterFetcher* ImplCreateAdapterFetcher() override { ++num_fetchers_created_; return adapter_fetchers_[next_adapter_fetcher_index_++]; } - virtual AdapterQuery* ImplCreateAdapterQuery() OVERRIDE { + virtual AdapterQuery* ImplCreateAdapterQuery() override { DCHECK(adapter_query_); return adapter_query_.get(); } - base::TimeDelta ImplGetMaxWait() OVERRIDE { + base::TimeDelta ImplGetMaxWait() override { return max_wait_; } - void ImplOnGetCandidateAdapterNamesDone() OVERRIDE { + void ImplOnGetCandidateAdapterNamesDone() override { worker_finished_event_.Signal(); } diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h index 3864d53..5a616dd 100644 --- a/net/proxy/mock_proxy_resolver.h +++ b/net/proxy/mock_proxy_resolver.h @@ -77,13 +77,13 @@ class MockAsyncProxyResolverBase : public ProxyResolver { ProxyInfo* results, const net::CompletionCallback& callback, RequestHandle* request_handle, - const BoundNetLog& /*net_log*/) OVERRIDE; - virtual void CancelRequest(RequestHandle request_handle) OVERRIDE; - virtual LoadState GetLoadState(RequestHandle request_handle) const OVERRIDE; + const BoundNetLog& /*net_log*/) override; + virtual void CancelRequest(RequestHandle request_handle) override; + virtual LoadState GetLoadState(RequestHandle request_handle) const override; virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const net::CompletionCallback& callback) OVERRIDE; - virtual void CancelSetPacScript() OVERRIDE; + const net::CompletionCallback& callback) override; + virtual void CancelSetPacScript() override; const RequestsList& pending_requests() const { return pending_requests_; diff --git a/net/proxy/mock_proxy_script_fetcher.h b/net/proxy/mock_proxy_script_fetcher.h index 81e221f..910c6b2 100644 --- a/net/proxy/mock_proxy_script_fetcher.h +++ b/net/proxy/mock_proxy_script_fetcher.h @@ -25,9 +25,9 @@ class MockProxyScriptFetcher : public ProxyScriptFetcher { // ProxyScriptFetcher implementation. virtual int Fetch(const GURL& url, base::string16* text, - const CompletionCallback& callback) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual URLRequestContext* GetRequestContext() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Cancel() override; + virtual URLRequestContext* GetRequestContext() const override; void NotifyFetchCompletion(int result, const std::string& ascii_text); const GURL& pending_request_url() const; diff --git a/net/proxy/multi_threaded_proxy_resolver.cc b/net/proxy/multi_threaded_proxy_resolver.cc index 4b68321..a2a6515 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_); diff --git a/net/proxy/multi_threaded_proxy_resolver.h b/net/proxy/multi_threaded_proxy_resolver.h index 5c470f4..0a14461 100644 --- a/net/proxy/multi_threaded_proxy_resolver.h +++ b/net/proxy/multi_threaded_proxy_resolver.h @@ -95,13 +95,13 @@ class NET_EXPORT_PRIVATE MultiThreadedProxyResolver ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle request) OVERRIDE; - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE; - virtual void CancelSetPacScript() OVERRIDE; + const BoundNetLog& net_log) override; + virtual void CancelRequest(RequestHandle request) override; + virtual LoadState GetLoadState(RequestHandle request) const override; + virtual void CancelSetPacScript() override; virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: class Executor; diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc index e1c9e90..d2e465c 100644 --- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc @@ -40,7 +40,7 @@ class MockProxyResolver : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { if (resolve_latency_ != base::TimeDelta()) base::PlatformThread::Sleep(resolve_latency_); @@ -58,22 +58,22 @@ class MockProxyResolver : public ProxyResolver { return request_count_++; } - virtual void CancelRequest(RequestHandle request) OVERRIDE { + virtual void CancelRequest(RequestHandle request) override { NOTREACHED(); } - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { + virtual LoadState GetLoadState(RequestHandle request) const override { NOTREACHED(); return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() OVERRIDE { + virtual void CancelSetPacScript() override { NOTREACHED(); } virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { CheckIsOnWorkerThread(); last_script_data_ = script_data; return OK; @@ -137,7 +137,7 @@ class BlockableProxyResolver : public MockProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { if (should_block_) { blocked_.Signal(); unblocked_.Wait(); @@ -164,27 +164,27 @@ class ForwardingProxyResolver : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { return impl_->GetProxyForURL( query_url, results, callback, request, net_log); } - virtual void CancelRequest(RequestHandle request) OVERRIDE { + virtual void CancelRequest(RequestHandle request) override { impl_->CancelRequest(request); } - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { + virtual LoadState GetLoadState(RequestHandle request) const override { NOTREACHED(); return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() OVERRIDE { + virtual void CancelSetPacScript() override { impl_->CancelSetPacScript(); } virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return impl_->SetPacScript(script_data, callback); } @@ -200,7 +200,7 @@ class ForwardingProxyResolverFactory : public ProxyResolverFactory { : ProxyResolverFactory(resolver->expects_pac_bytes()), resolver_(resolver) {} - virtual ProxyResolver* CreateProxyResolver() OVERRIDE { + virtual ProxyResolver* CreateProxyResolver() override { return new ForwardingProxyResolver(resolver_); } @@ -217,7 +217,7 @@ class BlockableProxyResolverFactory : public ProxyResolverFactory { STLDeleteElements(&resolvers_); } - virtual ProxyResolver* CreateProxyResolver() OVERRIDE { + virtual ProxyResolver* CreateProxyResolver() override { BlockableProxyResolver* resolver = new BlockableProxyResolver; resolvers_.push_back(resolver); return new ForwardingProxyResolver(resolver); diff --git a/net/proxy/network_delegate_error_observer.h b/net/proxy/network_delegate_error_observer.h index e4b03aa..70a2bed 100644 --- a/net/proxy/network_delegate_error_observer.h +++ b/net/proxy/network_delegate_error_observer.h @@ -28,7 +28,7 @@ class NET_EXPORT_PRIVATE NetworkDelegateErrorObserver // ProxyResolverErrorObserver implementation. virtual void OnPACScriptError(int line_number, const base::string16& error) - OVERRIDE; + override; private: class Core; diff --git a/net/proxy/network_delegate_error_observer_unittest.cc b/net/proxy/network_delegate_error_observer_unittest.cc index 1f6330f..8547761 100644 --- a/net/proxy/network_delegate_error_observer_unittest.cc +++ b/net/proxy/network_delegate_error_observer_unittest.cc @@ -27,62 +27,62 @@ class TestNetworkDelegate : public net::NetworkDelegate { // net::NetworkDelegate implementation. virtual int OnBeforeURLRequest(URLRequest* request, const CompletionCallback& callback, - GURL* new_url) OVERRIDE { + GURL* new_url) override { return OK; } virtual int OnBeforeSendHeaders(URLRequest* request, const CompletionCallback& callback, - HttpRequestHeaders* headers) OVERRIDE { + HttpRequestHeaders* headers) override { return OK; } virtual void OnSendHeaders(URLRequest* request, - const HttpRequestHeaders& headers) OVERRIDE {} + const HttpRequestHeaders& headers) override {} virtual int OnHeadersReceived( URLRequest* request, const CompletionCallback& callback, const HttpResponseHeaders* original_response_headers, scoped_refptr<HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE { + GURL* allowed_unsafe_redirect_url) override { return net::OK; } virtual void OnBeforeRedirect(URLRequest* request, - const GURL& new_location) OVERRIDE {} - virtual void OnResponseStarted(URLRequest* request) OVERRIDE {} + const GURL& new_location) override {} + virtual void OnResponseStarted(URLRequest* request) override {} virtual void OnRawBytesRead(const URLRequest& request, - int bytes_read) OVERRIDE {} - virtual void OnCompleted(URLRequest* request, bool started) OVERRIDE {} - virtual void OnURLRequestDestroyed(URLRequest* request) OVERRIDE {} + int bytes_read) override {} + virtual void OnCompleted(URLRequest* request, bool started) override {} + virtual void OnURLRequestDestroyed(URLRequest* request) override {} virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE { + const base::string16& error) override { got_pac_error_ = true; } virtual AuthRequiredResponse OnAuthRequired( URLRequest* request, const AuthChallengeInfo& auth_info, const AuthCallback& callback, - AuthCredentials* credentials) OVERRIDE { + AuthCredentials* credentials) override { return AUTH_REQUIRED_RESPONSE_NO_ACTION; } virtual bool OnCanGetCookies(const URLRequest& request, - const CookieList& cookie_list) OVERRIDE { + const CookieList& cookie_list) override { return true; } virtual bool OnCanSetCookie(const URLRequest& request, const std::string& cookie_line, - CookieOptions* options) OVERRIDE { + CookieOptions* options) override { return true; } virtual bool OnCanAccessFile(const net::URLRequest& request, - const base::FilePath& path) const OVERRIDE { + const base::FilePath& path) const override { return true; } - virtual bool OnCanThrottleRequest(const URLRequest& request) const OVERRIDE { + virtual bool OnCanThrottleRequest(const URLRequest& request) const override { return false; } virtual int OnBeforeSocketStreamConnect( SocketStream* stream, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return OK; } diff --git a/net/proxy/polling_proxy_config_service.h b/net/proxy/polling_proxy_config_service.h index f5f5117..dc0db488 100644 --- a/net/proxy/polling_proxy_config_service.h +++ b/net/proxy/polling_proxy_config_service.h @@ -20,10 +20,10 @@ namespace net { class NET_EXPORT_PRIVATE PollingProxyConfigService : public ProxyConfigService { public: // ProxyConfigService implementation: - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE; - virtual void OnLazyPoll() OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override; + virtual void OnLazyPoll() override; protected: // Function for retrieving the current proxy configuration. diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc index 239a2fe..debb2e8 100644 --- a/net/proxy/proxy_bypass_rules.cc +++ b/net/proxy/proxy_bypass_rules.cc @@ -27,7 +27,7 @@ class HostnamePatternRule : public ProxyBypassRules::Rule { optional_port_(optional_port) { } - virtual bool Matches(const GURL& url) const OVERRIDE { + virtual bool Matches(const GURL& url) const override { if (optional_port_ != -1 && url.EffectiveIntPort() != optional_port_) return false; // Didn't match port expectation. @@ -40,7 +40,7 @@ class HostnamePatternRule : public ProxyBypassRules::Rule { hostname_pattern_); } - virtual std::string ToString() const OVERRIDE { + virtual std::string ToString() const override { std::string str; if (!optional_scheme_.empty()) base::StringAppendF(&str, "%s://", optional_scheme_.c_str()); @@ -50,7 +50,7 @@ class HostnamePatternRule : public ProxyBypassRules::Rule { return str; } - virtual Rule* Clone() const OVERRIDE { + virtual Rule* Clone() const override { return new HostnamePatternRule(optional_scheme_, hostname_pattern_, optional_port_); @@ -64,18 +64,18 @@ class HostnamePatternRule : public ProxyBypassRules::Rule { class BypassLocalRule : public ProxyBypassRules::Rule { public: - virtual bool Matches(const GURL& url) const OVERRIDE { + virtual bool Matches(const GURL& url) const override { const std::string& host = url.host(); if (host == "127.0.0.1" || host == "[::1]") return true; return host.find('.') == std::string::npos; } - virtual std::string ToString() const OVERRIDE { + virtual std::string ToString() const override { return "<local>"; } - virtual Rule* Clone() const OVERRIDE { + virtual Rule* Clone() const override { return new BypassLocalRule(); } }; @@ -96,7 +96,7 @@ class BypassIPBlockRule : public ProxyBypassRules::Rule { prefix_length_in_bits_(prefix_length_in_bits) { } - virtual bool Matches(const GURL& url) const OVERRIDE { + virtual bool Matches(const GURL& url) const override { if (!url.HostIsIPAddress()) return false; @@ -113,11 +113,11 @@ class BypassIPBlockRule : public ProxyBypassRules::Rule { prefix_length_in_bits_); } - virtual std::string ToString() const OVERRIDE { + virtual std::string ToString() const override { return description_; } - virtual Rule* Clone() const OVERRIDE { + virtual Rule* Clone() const override { return new BypassIPBlockRule(description_, optional_scheme_, ip_prefix_, diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index d27bc5a..b294689 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -277,7 +277,7 @@ class ProxyConfigServiceAndroid::Delegate jobject jself, jstring jhost, jint jport, - jstring jpac_url) OVERRIDE { + jstring jpac_url) override { std::string host = ConvertJavaStringToUTF8(env, jhost); std::string pac_url; if (jpac_url) @@ -285,7 +285,7 @@ class ProxyConfigServiceAndroid::Delegate delegate_->ProxySettingsChangedTo(host, jport, pac_url); } - virtual void ProxySettingsChanged(JNIEnv* env, jobject self) OVERRIDE { + virtual void ProxySettingsChanged(JNIEnv* env, jobject self) override { delegate_->ProxySettingsChanged(); } diff --git a/net/proxy/proxy_config_service_android.h b/net/proxy/proxy_config_service_android.h index ee54b94..82c27f7 100644 --- a/net/proxy/proxy_config_service_android.h +++ b/net/proxy/proxy_config_service_android.h @@ -64,9 +64,9 @@ class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService { // ProxyConfigService: // Called only on the network thread. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override; private: friend class ProxyConfigServiceAndroidTestBase; diff --git a/net/proxy/proxy_config_service_android_unittest.cc b/net/proxy/proxy_config_service_android_unittest.cc index 03324b9..41f2387 100644 --- a/net/proxy/proxy_config_service_android_unittest.cc +++ b/net/proxy/proxy_config_service_android_unittest.cc @@ -25,7 +25,7 @@ class TestObserver : public ProxyConfigService::Observer { // ProxyConfigService::Observer: virtual void OnProxyConfigChanged( const ProxyConfig& config, - ProxyConfigService::ConfigAvailability availability) OVERRIDE { + ProxyConfigService::ConfigAvailability availability) override { config_ = config; availability_ = availability; } @@ -62,12 +62,12 @@ class ProxyConfigServiceAndroidTestBase : public testing::Test { virtual ~ProxyConfigServiceAndroidTestBase() {} // testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { message_loop_->RunUntilIdle(); service_.AddObserver(&observer_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { service_.RemoveObserver(&observer_); } diff --git a/net/proxy/proxy_config_service_fixed.h b/net/proxy/proxy_config_service_fixed.h index b5f30e3..14185c6 100644 --- a/net/proxy/proxy_config_service_fixed.h +++ b/net/proxy/proxy_config_service_fixed.h @@ -19,9 +19,9 @@ class NET_EXPORT ProxyConfigServiceFixed : public ProxyConfigService { virtual ~ProxyConfigServiceFixed(); // ProxyConfigService methods: - virtual void AddObserver(Observer* observer) OVERRIDE {} - virtual void RemoveObserver(Observer* observer) OVERRIDE {} - virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE; + virtual void AddObserver(Observer* observer) override {} + virtual void RemoveObserver(Observer* observer) override {} + virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override; private: ProxyConfig pc_; diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 4e9065e..145312e 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -235,7 +235,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { virtual bool Init( const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner, const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner) - OVERRIDE { + override { DCHECK(glib_task_runner->BelongsToCurrentThread()); DCHECK(!client_); DCHECK(!task_runner_.get()); @@ -273,7 +273,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { return true; } - virtual void ShutDown() OVERRIDE { + virtual void ShutDown() override { if (client_) { DCHECK(task_runner_->BelongsToCurrentThread()); // We must explicitly disable gconf notifications here, because the gconf @@ -291,7 +291,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { } virtual bool SetUpNotifications( - ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { + ProxyConfigServiceLinux::Delegate* delegate) override { DCHECK(client_); DCHECK(task_runner_->BelongsToCurrentThread()); GError* error = NULL; @@ -321,15 +321,15 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { } virtual const scoped_refptr<base::SingleThreadTaskRunner>& - GetNotificationTaskRunner() OVERRIDE { + GetNotificationTaskRunner() override { return task_runner_; } - virtual ProxyConfigSource GetConfigSource() OVERRIDE { + virtual ProxyConfigSource GetConfigSource() override { return PROXY_CONFIG_SOURCE_GCONF; } - virtual bool GetString(StringSetting key, std::string* result) OVERRIDE { + virtual bool GetString(StringSetting key, std::string* result) override { switch (key) { case PROXY_MODE: return GetStringByPath("/system/proxy/mode", result); @@ -346,7 +346,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { } return false; // Placate compiler. } - virtual bool GetBool(BoolSetting key, bool* result) OVERRIDE { + virtual bool GetBool(BoolSetting key, bool* result) override { switch (key) { case PROXY_USE_HTTP_PROXY: return GetBoolByPath("/system/http_proxy/use_http_proxy", result); @@ -357,7 +357,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { } return false; // Placate compiler. } - virtual bool GetInt(IntSetting key, int* result) OVERRIDE { + virtual bool GetInt(IntSetting key, int* result) override { switch (key) { case PROXY_HTTP_PORT: return GetIntByPath("/system/http_proxy/port", result); @@ -371,7 +371,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { return false; // Placate compiler. } virtual bool GetStringList(StringListSetting key, - std::vector<std::string>* result) OVERRIDE { + std::vector<std::string>* result) override { switch (key) { case PROXY_IGNORE_HOSTS: return GetStringListByPath("/system/http_proxy/ignore_hosts", result); @@ -379,12 +379,12 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { return false; // Placate compiler. } - virtual bool BypassListIsReversed() OVERRIDE { + virtual bool BypassListIsReversed() override { // This is a KDE-specific setting. return false; } - virtual bool MatchHostsUsingSuffixMatching() OVERRIDE { + virtual bool MatchHostsUsingSuffixMatching() override { return false; } @@ -568,7 +568,7 @@ class SettingGetterImplGSettings virtual bool Init( const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner, const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner) - OVERRIDE { + override { DCHECK(glib_task_runner->BelongsToCurrentThread()); DCHECK(!client_); DCHECK(!task_runner_.get()); @@ -589,7 +589,7 @@ class SettingGetterImplGSettings return true; } - virtual void ShutDown() OVERRIDE { + virtual void ShutDown() override { if (client_) { DCHECK(task_runner_->BelongsToCurrentThread()); // This also disables gsettings notifications. @@ -605,7 +605,7 @@ class SettingGetterImplGSettings } virtual bool SetUpNotifications( - ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { + ProxyConfigServiceLinux::Delegate* delegate) override { DCHECK(client_); DCHECK(task_runner_->BelongsToCurrentThread()); notify_delegate_ = delegate; @@ -628,15 +628,15 @@ class SettingGetterImplGSettings } virtual const scoped_refptr<base::SingleThreadTaskRunner>& - GetNotificationTaskRunner() OVERRIDE { + GetNotificationTaskRunner() override { return task_runner_; } - virtual ProxyConfigSource GetConfigSource() OVERRIDE { + virtual ProxyConfigSource GetConfigSource() override { return PROXY_CONFIG_SOURCE_GSETTINGS; } - virtual bool GetString(StringSetting key, std::string* result) OVERRIDE { + virtual bool GetString(StringSetting key, std::string* result) override { DCHECK(client_); switch (key) { case PROXY_MODE: @@ -654,7 +654,7 @@ class SettingGetterImplGSettings } return false; // Placate compiler. } - virtual bool GetBool(BoolSetting key, bool* result) OVERRIDE { + virtual bool GetBool(BoolSetting key, bool* result) override { DCHECK(client_); switch (key) { case PROXY_USE_HTTP_PROXY: @@ -672,7 +672,7 @@ class SettingGetterImplGSettings } return false; // Placate compiler. } - virtual bool GetInt(IntSetting key, int* result) OVERRIDE { + virtual bool GetInt(IntSetting key, int* result) override { DCHECK(client_); switch (key) { case PROXY_HTTP_PORT: @@ -687,7 +687,7 @@ class SettingGetterImplGSettings return false; // Placate compiler. } virtual bool GetStringList(StringListSetting key, - std::vector<std::string>* result) OVERRIDE { + std::vector<std::string>* result) override { DCHECK(client_); switch (key) { case PROXY_IGNORE_HOSTS: @@ -696,12 +696,12 @@ class SettingGetterImplGSettings return false; // Placate compiler. } - virtual bool BypassListIsReversed() OVERRIDE { + virtual bool BypassListIsReversed() override { // This is a KDE-specific setting. return false; } - virtual bool MatchHostsUsingSuffixMatching() OVERRIDE { + virtual bool MatchHostsUsingSuffixMatching() override { return false; } @@ -932,7 +932,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, virtual bool Init( const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner, const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner) - OVERRIDE { + override { // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); @@ -956,7 +956,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, return true; } - virtual void ShutDown() OVERRIDE { + virtual void ShutDown() override { if (inotify_fd_ >= 0) { ResetCachedSettings(); inotify_watcher_.StopWatchingFileDescriptor(); @@ -966,7 +966,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, } virtual bool SetUpNotifications( - ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { + ProxyConfigServiceLinux::Delegate* delegate) override { DCHECK(inotify_fd_ >= 0); DCHECK(file_task_runner_->BelongsToCurrentThread()); // We can't just watch the kioslaverc file directly, since KDE will write @@ -990,41 +990,41 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, } virtual const scoped_refptr<base::SingleThreadTaskRunner>& - GetNotificationTaskRunner() OVERRIDE { + GetNotificationTaskRunner() override { return file_task_runner_; } // Implement base::MessagePumpLibevent::Watcher. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanReadWithoutBlocking(int fd) override { DCHECK_EQ(fd, inotify_fd_); DCHECK(file_task_runner_->BelongsToCurrentThread()); OnChangeNotification(); } - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } - virtual ProxyConfigSource GetConfigSource() OVERRIDE { + virtual ProxyConfigSource GetConfigSource() override { return PROXY_CONFIG_SOURCE_KDE; } - virtual bool GetString(StringSetting key, std::string* result) OVERRIDE { + virtual bool GetString(StringSetting key, std::string* result) override { string_map_type::iterator it = string_table_.find(key); if (it == string_table_.end()) return false; *result = it->second; return true; } - virtual bool GetBool(BoolSetting key, bool* result) OVERRIDE { + virtual bool GetBool(BoolSetting key, bool* result) override { // We don't ever have any booleans. return false; } - virtual bool GetInt(IntSetting key, int* result) OVERRIDE { + virtual bool GetInt(IntSetting key, int* result) override { // We don't ever have any integers. (See AddProxy() below about ports.) return false; } virtual bool GetStringList(StringListSetting key, - std::vector<std::string>* result) OVERRIDE { + std::vector<std::string>* result) override { strings_map_type::iterator it = strings_table_.find(key); if (it == strings_table_.end()) return false; @@ -1032,11 +1032,11 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, return true; } - virtual bool BypassListIsReversed() OVERRIDE { + virtual bool BypassListIsReversed() override { return reversed_bypass_list_; } - virtual bool MatchHostsUsingSuffixMatching() OVERRIDE { + virtual bool MatchHostsUsingSuffixMatching() override { return true; } diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h index fa7bd45..a8438c2 100644 --- a/net/proxy/proxy_config_service_linux.h +++ b/net/proxy/proxy_config_service_linux.h @@ -296,10 +296,10 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService { // ProxyConfigService methods: // Called from IO thread. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual ProxyConfigService::ConfigAvailability GetLatestProxyConfig( - ProxyConfig* config) OVERRIDE; + ProxyConfig* config) override; private: scoped_refptr<Delegate> delegate_; diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index 5ca0fdc..cfb0cff 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -107,7 +107,7 @@ class MockEnvironment : public base::Environment { } // Begin base::Environment implementation. - virtual bool GetVar(const char* variable_name, std::string* result) OVERRIDE { + virtual bool GetVar(const char* variable_name, std::string* result) override { std::map<std::string, const char**>::iterator it = table.find(variable_name); if (it != table.end() && *(it->second) != NULL) { @@ -119,12 +119,12 @@ class MockEnvironment : public base::Environment { } virtual bool SetVar(const char* variable_name, const std::string& new_value) - OVERRIDE { + override { ADD_FAILURE(); return false; } - virtual bool UnSetVar(const char* variable_name) OVERRIDE { + virtual bool UnSetVar(const char* variable_name) override { ADD_FAILURE(); return false; } @@ -178,28 +178,28 @@ class MockSettingGetter virtual bool Init( const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner, const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner) - OVERRIDE { + override { task_runner_ = glib_task_runner; return true; } - virtual void ShutDown() OVERRIDE {} + virtual void ShutDown() override {} virtual bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) - OVERRIDE { + override { return true; } virtual const scoped_refptr<base::SingleThreadTaskRunner>& - GetNotificationTaskRunner() OVERRIDE { + GetNotificationTaskRunner() override { return task_runner_; } - virtual ProxyConfigSource GetConfigSource() OVERRIDE { + virtual ProxyConfigSource GetConfigSource() override { return PROXY_CONFIG_SOURCE_TEST; } - virtual bool GetString(StringSetting key, std::string* result) OVERRIDE { + virtual bool GetString(StringSetting key, std::string* result) override { const char* value = strings_table.Get(key); if (value) { *result = value; @@ -208,7 +208,7 @@ class MockSettingGetter return false; } - virtual bool GetBool(BoolSetting key, bool* result) OVERRIDE { + virtual bool GetBool(BoolSetting key, bool* result) override { BoolSettingValue value = bools_table.Get(key); switch (value) { case UNSET: @@ -222,24 +222,24 @@ class MockSettingGetter return true; } - virtual bool GetInt(IntSetting key, int* result) OVERRIDE { + virtual bool GetInt(IntSetting key, int* result) override { // We don't bother to distinguish unset keys from 0 values. *result = ints_table.Get(key); return true; } virtual bool GetStringList(StringListSetting key, - std::vector<std::string>* result) OVERRIDE { + std::vector<std::string>* result) override { *result = string_lists_table.Get(key); // We don't bother to distinguish unset keys from empty lists. return !result->empty(); } - virtual bool BypassListIsReversed() OVERRIDE { + virtual bool BypassListIsReversed() override { return false; } - virtual bool MatchHostsUsingSuffixMatching() OVERRIDE { + virtual bool MatchHostsUsingSuffixMatching() override { return false; } @@ -355,7 +355,7 @@ namespace net { // must use the same test fixture class (also "ProxyConfigServiceLinuxTest"). class ProxyConfigServiceLinuxTest : public PlatformTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { PlatformTest::SetUp(); // Set up a temporary KDE home directory. std::string prefix("ProxyConfigServiceLinuxTest_user_home"); @@ -372,7 +372,7 @@ class ProxyConfigServiceLinuxTest : public PlatformTest { kioslaverc4_ = kde4_config_.Append(FILE_PATH_LITERAL("kioslaverc")); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Delete the temporary KDE home directory. base::DeleteFile(user_home_, true); PlatformTest::TearDown(); diff --git a/net/proxy/proxy_config_service_mac.h b/net/proxy/proxy_config_service_mac.h index 6c11c6f..6c60daf 100644 --- a/net/proxy/proxy_config_service_mac.h +++ b/net/proxy/proxy_config_service_mac.h @@ -31,9 +31,9 @@ class ProxyConfigServiceMac : public ProxyConfigService { public: // ProxyConfigService implementation: - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override; private: class Helper; @@ -46,10 +46,10 @@ class ProxyConfigServiceMac : public ProxyConfigService { : proxy_config_service_(proxy_config_service) {} // NetworkConfigWatcherMac::Delegate implementation: - virtual void StartReachabilityNotifications() OVERRIDE {} + virtual void StartReachabilityNotifications() override {} virtual void SetDynamicStoreNotificationKeys( - SCDynamicStoreRef store) OVERRIDE; - virtual void OnNetworkConfigChange(CFArrayRef changed_keys) OVERRIDE; + SCDynamicStoreRef store) override; + virtual void OnNetworkConfigChange(CFArrayRef changed_keys) override; private: ProxyConfigServiceMac* const proxy_config_service_; diff --git a/net/proxy/proxy_config_service_win.h b/net/proxy/proxy_config_service_win.h index aa91b68..62f1f12 100644 --- a/net/proxy/proxy_config_service_win.h +++ b/net/proxy/proxy_config_service_win.h @@ -47,7 +47,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceWin virtual ~ProxyConfigServiceWin(); // Overrides a function from PollingProxyConfigService. - virtual void AddObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; private: FRIEND_TEST_ALL_PREFIXES(ProxyConfigServiceWinTest, SetFromIEConfig); @@ -63,7 +63,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceWin // ObjectWatcher::Delegate methods: // This is called whenever one of the registry keys we are watching change. - virtual void OnObjectSignaled(HANDLE object) OVERRIDE; + virtual void OnObjectSignaled(HANDLE object) override; static void GetCurrentProxyConfig(ProxyConfig* config); diff --git a/net/proxy/proxy_resolver_mac.h b/net/proxy/proxy_resolver_mac.h index 24eb10d..c732988 100644 --- a/net/proxy/proxy_resolver_mac.h +++ b/net/proxy/proxy_resolver_mac.h @@ -25,17 +25,17 @@ class NET_EXPORT ProxyResolverMac : public ProxyResolver { ProxyInfo* results, const net::CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; - virtual void CancelRequest(RequestHandle request) OVERRIDE; + virtual void CancelRequest(RequestHandle request) override; - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE; + virtual LoadState GetLoadState(RequestHandle request) const override; - virtual void CancelSetPacScript() OVERRIDE; + virtual void CancelSetPacScript() override; virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const net::CompletionCallback& /*callback*/) OVERRIDE; + const net::CompletionCallback& /*callback*/) override; private: scoped_refptr<ProxyResolverScriptData> script_data_; diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc index 3d7854c..061c13e 100644 --- a/net/proxy/proxy_resolver_perftest.cc +++ b/net/proxy/proxy_resolver_perftest.cc @@ -199,20 +199,20 @@ class MockJSBindings : public net::ProxyResolverV8::JSBindings { public: MockJSBindings() {} - virtual void Alert(const base::string16& message) OVERRIDE { + virtual void Alert(const base::string16& message) override { CHECK(false); } virtual bool ResolveDns(const std::string& host, ResolveDnsOperation op, std::string* output, - bool* terminate) OVERRIDE { + bool* terminate) override { CHECK(false); return false; } virtual void OnError(int line_number, - const base::string16& message) OVERRIDE { + const base::string16& message) override { CHECK(false); } }; diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 37f31bf..26f3e71 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -93,11 +93,11 @@ class V8ExternalStringFromScriptData const scoped_refptr<ProxyResolverScriptData>& script_data) : script_data_(script_data) {} - virtual const uint16_t* data() const OVERRIDE { + virtual const uint16_t* data() const override { return reinterpret_cast<const uint16*>(script_data_->utf16().data()); } - virtual size_t length() const OVERRIDE { + virtual size_t length() const override { return script_data_->utf16().size(); } @@ -116,11 +116,11 @@ class V8ExternalASCIILiteral : public v8::String::ExternalAsciiStringResource { DCHECK(base::IsStringASCII(ascii)); } - virtual const char* data() const OVERRIDE { + virtual const char* data() const override { return ascii_; } - virtual size_t length() const OVERRIDE { + virtual size_t length() const override { return length_; } diff --git a/net/proxy/proxy_resolver_v8.h b/net/proxy/proxy_resolver_v8.h index c754e31..38b958d 100644 --- a/net/proxy/proxy_resolver_v8.h +++ b/net/proxy/proxy_resolver_v8.h @@ -86,13 +86,13 @@ class NET_EXPORT_PRIVATE ProxyResolverV8 : public ProxyResolver { ProxyInfo* results, const net::CompletionCallback& /*callback*/, RequestHandle* /*request*/, - const BoundNetLog& net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle request) OVERRIDE; - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE; - virtual void CancelSetPacScript() OVERRIDE; + const BoundNetLog& net_log) override; + virtual void CancelRequest(RequestHandle request) override; + virtual LoadState GetLoadState(RequestHandle request) const override; + virtual void CancelSetPacScript() override; virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const net::CompletionCallback& /*callback*/) OVERRIDE; + const net::CompletionCallback& /*callback*/) override; // Create an isolate to use for the proxy resolver. If the embedder invokes // this method multiple times, it must be invoked in a thread safe manner, diff --git a/net/proxy/proxy_resolver_v8_tracing.cc b/net/proxy/proxy_resolver_v8_tracing.cc index b7cb185..b5e934b 100644 --- a/net/proxy/proxy_resolver_v8_tracing.cc +++ b/net/proxy/proxy_resolver_v8_tracing.cc @@ -148,9 +148,9 @@ class ProxyResolverV8Tracing::Job virtual bool ResolveDns(const std::string& host, ResolveDnsOperation op, std::string* output, - bool* terminate) OVERRIDE; - virtual void Alert(const base::string16& message) OVERRIDE; - virtual void OnError(int line_number, const base::string16& error) OVERRIDE; + bool* terminate) override; + virtual void Alert(const base::string16& message) override; + virtual void OnError(int line_number, const base::string16& error) override; bool ResolveDnsBlocking(const std::string& host, ResolveDnsOperation op, diff --git a/net/proxy/proxy_resolver_v8_tracing.h b/net/proxy/proxy_resolver_v8_tracing.h index d738a09..92eac03 100644 --- a/net/proxy/proxy_resolver_v8_tracing.h +++ b/net/proxy/proxy_resolver_v8_tracing.h @@ -49,13 +49,13 @@ class NET_EXPORT_PRIVATE ProxyResolverV8Tracing ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE; - virtual void CancelRequest(RequestHandle request) OVERRIDE; - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE; - virtual void CancelSetPacScript() OVERRIDE; + const BoundNetLog& net_log) override; + virtual void CancelRequest(RequestHandle request) override; + virtual LoadState GetLoadState(RequestHandle request) const override; + virtual void CancelSetPacScript() override; virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: class Job; diff --git a/net/proxy/proxy_resolver_v8_tracing_unittest.cc b/net/proxy/proxy_resolver_v8_tracing_unittest.cc index b5ea3e8..a6e38cb 100644 --- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc +++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc @@ -31,7 +31,7 @@ namespace { class ProxyResolverV8TracingTest : public testing::Test { public: - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Drain any pending messages, which may be left over from cancellation. // This way they get reliably run as part of the current test, rather than // spilling into the next test's execution. @@ -71,7 +71,7 @@ class MockErrorObserver : public ProxyResolverErrorObserver { MockErrorObserver() : event_(true, false) {} virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE { + const base::string16& error) override { { base::AutoLock l(lock_); output += base::StringPrintf("Error: line %d: %s\n", line_number, @@ -768,7 +768,7 @@ class BlockableHostResolver : public HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { EXPECT_FALSE(callback.is_null()); EXPECT_TRUE(out_req); @@ -791,12 +791,12 @@ class BlockableHostResolver : public HostResolver { virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { NOTREACHED(); return ERR_DNS_CACHE_MISS; } - virtual void CancelRequest(RequestHandle req) OVERRIDE { + virtual void CancelRequest(RequestHandle req) override { EXPECT_EQ(reinterpret_cast<RequestHandle*>(1), req); num_cancelled_requests_++; } diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc index b0f2d17..d0d01d9 100644 --- a/net/proxy/proxy_resolver_v8_unittest.cc +++ b/net/proxy/proxy_resolver_v8_unittest.cc @@ -26,7 +26,7 @@ class MockJSBindings : public ProxyResolverV8::JSBindings { MockJSBindings() : my_ip_address_count(0), my_ip_address_ex_count(0), should_terminate(false) {} - virtual void Alert(const base::string16& message) OVERRIDE { + virtual void Alert(const base::string16& message) override { VLOG(1) << "PAC-alert: " << message; // Helpful when debugging. alerts.push_back(base::UTF16ToUTF8(message)); } @@ -34,7 +34,7 @@ class MockJSBindings : public ProxyResolverV8::JSBindings { virtual bool ResolveDns(const std::string& host, ResolveDnsOperation op, std::string* output, - bool* terminate) OVERRIDE { + bool* terminate) override { *terminate = should_terminate; if (op == MY_IP_ADDRESS) { @@ -66,7 +66,7 @@ class MockJSBindings : public ProxyResolverV8::JSBindings { } virtual void OnError(int line_number, - const base::string16& message) OVERRIDE { + const base::string16& message) override { // Helpful when debugging. VLOG(1) << "PAC-error: [" << line_number << "] " << message; diff --git a/net/proxy/proxy_resolver_winhttp.h b/net/proxy/proxy_resolver_winhttp.h index 62b5643..caa7a9f 100644 --- a/net/proxy/proxy_resolver_winhttp.h +++ b/net/proxy/proxy_resolver_winhttp.h @@ -25,16 +25,16 @@ class NET_EXPORT_PRIVATE ProxyResolverWinHttp : public ProxyResolver { ProxyInfo* results, const net::CompletionCallback& /*callback*/, RequestHandle* /*request*/, - const BoundNetLog& /*net_log*/) OVERRIDE; - virtual void CancelRequest(RequestHandle request) OVERRIDE; + const BoundNetLog& /*net_log*/) override; + virtual void CancelRequest(RequestHandle request) override; - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE; + virtual LoadState GetLoadState(RequestHandle request) const override; - virtual void CancelSetPacScript() OVERRIDE; + virtual void CancelSetPacScript() override; virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& script_data, - const net::CompletionCallback& /*callback*/) OVERRIDE; + const net::CompletionCallback& /*callback*/) override; private: bool OpenWinHttpSession(); diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc index c50b31e..880a187 100644 --- a/net/proxy/proxy_script_decider_unittest.cc +++ b/net/proxy/proxy_script_decider_unittest.cc @@ -107,7 +107,7 @@ class RuleBasedProxyScriptFetcher : public ProxyScriptFetcher { // ProxyScriptFetcher implementation. virtual int Fetch(const GURL& url, base::string16* text, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { const Rules::Rule& rule = rules_->GetRuleByUrl(url); int rv = rule.fetch_error; EXPECT_NE(ERR_UNEXPECTED, rv); @@ -116,9 +116,9 @@ class RuleBasedProxyScriptFetcher : public ProxyScriptFetcher { return rv; } - virtual void Cancel() OVERRIDE {} + virtual void Cancel() override {} - virtual URLRequestContext* GetRequestContext() const OVERRIDE { + virtual URLRequestContext* GetRequestContext() const override { return request_context_; } @@ -134,9 +134,9 @@ class MockDhcpProxyScriptFetcher : public DhcpProxyScriptFetcher { virtual ~MockDhcpProxyScriptFetcher(); virtual int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual const GURL& GetPacURL() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Cancel() override; + virtual const GURL& GetPacURL() const override; virtual void SetPacURL(const GURL& url); @@ -310,7 +310,7 @@ class ProxyScriptDeciderQuickCheckTest : public ::testing::Test { : rule_(rules_.AddSuccessRule("http://wpad/wpad.dat")), fetcher_(&rules_) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { request_context_.set_host_resolver(&resolver_); fetcher_.SetRequestContext(&request_context_); config_.set_auto_detect(true); @@ -643,15 +643,15 @@ class SynchronousSuccessDhcpFetcher : public DhcpProxyScriptFetcher { } virtual int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { *utf16_text = expected_text_; return OK; } - virtual void Cancel() OVERRIDE { + virtual void Cancel() override { } - virtual const GURL& GetPacURL() const OVERRIDE { + virtual const GURL& GetPacURL() const override { return gurl_; } @@ -725,7 +725,7 @@ class AsyncFailDhcpFetcher virtual ~AsyncFailDhcpFetcher() {} virtual int Fetch(base::string16* utf16_text, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { callback_ = callback; base::MessageLoop::current()->PostTask( FROM_HERE, @@ -733,11 +733,11 @@ class AsyncFailDhcpFetcher return ERR_IO_PENDING; } - virtual void Cancel() OVERRIDE { + virtual void Cancel() override { callback_.Reset(); } - virtual const GURL& GetPacURL() const OVERRIDE { + virtual const GURL& GetPacURL() const override { return dummy_gurl_; } diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h index 31e60b4..8cdcf81 100644 --- a/net/proxy/proxy_script_fetcher_impl.h +++ b/net/proxy/proxy_script_fetcher_impl.h @@ -46,18 +46,18 @@ class NET_EXPORT ProxyScriptFetcherImpl : public ProxyScriptFetcher, // ProxyScriptFetcher methods: virtual int Fetch(const GURL& url, base::string16* text, - const net::CompletionCallback& callback) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual URLRequestContext* GetRequestContext() const OVERRIDE; + const net::CompletionCallback& callback) override; + virtual void Cancel() override; + virtual URLRequestContext* GetRequestContext() const override; // URLRequest::Delegate methods: virtual void OnAuthRequired(URLRequest* request, - AuthChallengeInfo* auth_info) OVERRIDE; + AuthChallengeInfo* auth_info) override; virtual void OnSSLCertificateError(URLRequest* request, const SSLInfo& ssl_info, - bool is_hsts_ok) OVERRIDE; - virtual void OnResponseStarted(URLRequest* request) OVERRIDE; - virtual void OnReadCompleted(URLRequest* request, int num_bytes) OVERRIDE; + bool is_hsts_ok) override; + virtual void OnResponseStarted(URLRequest* request) override; + virtual void OnReadCompleted(URLRequest* request, int num_bytes) override; private: enum { kBufSize = 4096 }; diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index bc927e0..5eb887e 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -117,74 +117,74 @@ class BasicNetworkDelegate : public NetworkDelegate { private: virtual int OnBeforeURLRequest(URLRequest* request, const CompletionCallback& callback, - GURL* new_url) OVERRIDE { + GURL* new_url) override { EXPECT_TRUE(request->load_flags() & LOAD_DISABLE_CERT_REVOCATION_CHECKING); return OK; } virtual int OnBeforeSendHeaders(URLRequest* request, const CompletionCallback& callback, - HttpRequestHeaders* headers) OVERRIDE { + HttpRequestHeaders* headers) override { return OK; } virtual void OnSendHeaders(URLRequest* request, - const HttpRequestHeaders& headers) OVERRIDE {} + const HttpRequestHeaders& headers) override {} virtual int OnHeadersReceived( URLRequest* request, const CompletionCallback& callback, const HttpResponseHeaders* original_response_headers, scoped_refptr<HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE { + GURL* allowed_unsafe_redirect_url) override { return OK; } virtual void OnBeforeRedirect(URLRequest* request, - const GURL& new_location) OVERRIDE {} + const GURL& new_location) override {} - virtual void OnResponseStarted(URLRequest* request) OVERRIDE {} + virtual void OnResponseStarted(URLRequest* request) override {} virtual void OnRawBytesRead(const URLRequest& request, - int bytes_read) OVERRIDE {} + int bytes_read) override {} - virtual void OnCompleted(URLRequest* request, bool started) OVERRIDE {} + virtual void OnCompleted(URLRequest* request, bool started) override {} - virtual void OnURLRequestDestroyed(URLRequest* request) OVERRIDE {} + virtual void OnURLRequestDestroyed(URLRequest* request) override {} virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE {} + const base::string16& error) override {} virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired( URLRequest* request, const AuthChallengeInfo& auth_info, const AuthCallback& callback, - AuthCredentials* credentials) OVERRIDE { + AuthCredentials* credentials) override { return NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; } virtual bool OnCanGetCookies(const URLRequest& request, - const CookieList& cookie_list) OVERRIDE { + const CookieList& cookie_list) override { return true; } virtual bool OnCanSetCookie(const URLRequest& request, const std::string& cookie_line, - CookieOptions* options) OVERRIDE { + CookieOptions* options) override { return true; } virtual bool OnCanAccessFile(const net::URLRequest& request, - const base::FilePath& path) const OVERRIDE { + const base::FilePath& path) const override { return true; } - virtual bool OnCanThrottleRequest(const URLRequest& request) const OVERRIDE { + virtual bool OnCanThrottleRequest(const URLRequest& request) const override { return false; } virtual int OnBeforeSocketStreamConnect( SocketStream* stream, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return OK; } diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 47a4dc2..52e9f7f 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -121,7 +121,7 @@ class DefaultPollPolicy : public ProxyService::PacPollPolicy { virtual Mode GetNextDelay(int initial_error, TimeDelta current_delay, - TimeDelta* next_delay) const OVERRIDE { + TimeDelta* next_delay) const override { if (initial_error != OK) { // Re-try policy for failures. const int kDelay1Seconds = 8; @@ -160,10 +160,10 @@ class DefaultPollPolicy : public ProxyService::PacPollPolicy { class ProxyConfigServiceDirect : public ProxyConfigService { public: // ProxyConfigService implementation: - virtual void AddObserver(Observer* observer) OVERRIDE {} - virtual void RemoveObserver(Observer* observer) OVERRIDE {} + virtual void AddObserver(Observer* observer) override {} + virtual void RemoveObserver(Observer* observer) override {} virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) - OVERRIDE { + override { *config = ProxyConfig::CreateDirect(); config->set_source(PROXY_CONFIG_SOURCE_UNKNOWN); return CONFIG_VALID; @@ -180,26 +180,26 @@ class ProxyResolverNull : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { return ERR_NOT_IMPLEMENTED; } - virtual void CancelRequest(RequestHandle request) OVERRIDE { + virtual void CancelRequest(RequestHandle request) override { NOTREACHED(); } - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { + virtual LoadState GetLoadState(RequestHandle request) const override { NOTREACHED(); return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() OVERRIDE { + virtual void CancelSetPacScript() override { NOTREACHED(); } virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& /*script_data*/, - const CompletionCallback& /*callback*/) OVERRIDE { + const CompletionCallback& /*callback*/) override { return ERR_NOT_IMPLEMENTED; } }; @@ -216,27 +216,27 @@ class ProxyResolverFromPacString : public ProxyResolver { ProxyInfo* results, const CompletionCallback& callback, RequestHandle* request, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { results->UsePacString(pac_string_); return OK; } - virtual void CancelRequest(RequestHandle request) OVERRIDE { + virtual void CancelRequest(RequestHandle request) override { NOTREACHED(); } - virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE { + virtual LoadState GetLoadState(RequestHandle request) const override { NOTREACHED(); return LOAD_STATE_IDLE; } - virtual void CancelSetPacScript() OVERRIDE { + virtual void CancelSetPacScript() override { NOTREACHED(); } virtual int SetPacScript( const scoped_refptr<ProxyResolverScriptData>& pac_script, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return OK; } @@ -250,7 +250,7 @@ class ProxyResolverFactoryForSystem : public ProxyResolverFactory { ProxyResolverFactoryForSystem() : ProxyResolverFactory(false /*expects_pac_bytes*/) {} - virtual ProxyResolver* CreateProxyResolver() OVERRIDE { + virtual ProxyResolver* CreateProxyResolver() override { DCHECK(IsSupported()); #if defined(OS_WIN) return new ProxyResolverWinHttp(); @@ -313,10 +313,10 @@ class UnsetProxyConfigService : public ProxyConfigService { UnsetProxyConfigService() {} virtual ~UnsetProxyConfigService() {} - virtual void AddObserver(Observer* observer) OVERRIDE {} - virtual void RemoveObserver(Observer* observer) OVERRIDE {} + virtual void AddObserver(Observer* observer) override {} + virtual void RemoveObserver(Observer* observer) override {} virtual ConfigAvailability GetLatestProxyConfig( - ProxyConfig* config) OVERRIDE { + ProxyConfig* config) override { return CONFIG_UNSET; } }; diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 9fdcb58..6f32c29 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -356,16 +356,16 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver, // NetworkChangeNotifier::IPAddressObserver // When this is called, we re-fetch PAC scripts and re-run WPAD. - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; // NetworkChangeNotifier::DNSObserver // We respond as above. - virtual void OnDNSChanged() OVERRIDE; + virtual void OnDNSChanged() override; // ProxyConfigService::Observer virtual void OnProxyConfigChanged( const ProxyConfig& config, - ProxyConfigService::ConfigAvailability availability) OVERRIDE; + ProxyConfigService::ConfigAvailability availability) override; scoped_ptr<ProxyConfigService> config_service_; scoped_ptr<ProxyResolver> resolver_; diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index a222710..12f9af2 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -38,7 +38,7 @@ class ImmediatePollPolicy : public ProxyService::PacPollPolicy { ImmediatePollPolicy() {} virtual Mode GetNextDelay(int error, base::TimeDelta current_delay, - base::TimeDelta* next_delay) const OVERRIDE { + base::TimeDelta* next_delay) const override { *next_delay = base::TimeDelta::FromMilliseconds(1); return MODE_USE_TIMER; } @@ -54,7 +54,7 @@ class NeverPollPolicy : public ProxyService::PacPollPolicy { NeverPollPolicy() {} virtual Mode GetNextDelay(int error, base::TimeDelta current_delay, - base::TimeDelta* next_delay) const OVERRIDE { + base::TimeDelta* next_delay) const override { *next_delay = base::TimeDelta::FromDays(60); return MODE_USE_TIMER; } @@ -69,7 +69,7 @@ class ImmediateAfterActivityPollPolicy : public ProxyService::PacPollPolicy { ImmediateAfterActivityPollPolicy() {} virtual Mode GetNextDelay(int error, base::TimeDelta current_delay, - base::TimeDelta* next_delay) const OVERRIDE { + base::TimeDelta* next_delay) const override { *next_delay = base::TimeDelta(); return MODE_START_AFTER_ACTIVITY; } @@ -95,13 +95,13 @@ class ImmediateAfterActivityPollPolicy : public ProxyService::PacPollPolicy { // are careful to avoid timing problems. class ProxyServiceTest : public testing::Test { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { testing::Test::SetUp(); previous_policy_ = ProxyService::set_pac_script_poll_policy(&never_poll_policy_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { // Restore the original policy. ProxyService::set_pac_script_poll_policy(previous_policy_); testing::Test::TearDown(); @@ -127,16 +127,16 @@ class MockProxyConfigService: public ProxyConfigService { config_(ProxyConfig::CreateFromCustomPacURL(GURL(pac_url))) { } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* results) - OVERRIDE { + override { if (availability_ == CONFIG_VALID) *results = config_; return availability_; @@ -168,7 +168,7 @@ class TestResolveProxyNetworkDelegate : public NetworkDelegate { virtual void OnResolveProxy(const GURL& url, int load_flags, const ProxyService& proxy_service, - ProxyInfo* result) OVERRIDE { + ProxyInfo* result) override { on_resolve_proxy_called_ = true; proxy_service_ = &proxy_service; DCHECK(!add_proxy_ || !remove_proxy_); @@ -211,7 +211,7 @@ class TestProxyFallbackNetworkDelegate : public NetworkDelegate { } virtual void OnProxyFallback(const ProxyServer& proxy_server, - int net_error) OVERRIDE { + int net_error) override { proxy_server_ = proxy_server; proxy_fallback_net_error_ = net_error; on_proxy_fallback_called_ = true; diff --git a/net/quic/congestion_control/pacing_sender.h b/net/quic/congestion_control/pacing_sender.h index f61ae75..85e288e 100644 --- a/net/quic/congestion_control/pacing_sender.h +++ b/net/quic/congestion_control/pacing_sender.h @@ -35,34 +35,34 @@ class NET_EXPORT_PRIVATE PacingSender : public SendAlgorithmInterface { virtual ~PacingSender(); // SendAlgorithmInterface methods. - virtual void SetFromConfig(const QuicConfig& config, bool is_server) OVERRIDE; - virtual void SetNumEmulatedConnections(int num_connections) OVERRIDE; + virtual void SetFromConfig(const QuicConfig& config, bool is_server) override; + virtual void SetNumEmulatedConnections(int num_connections) override; virtual void OnIncomingQuicCongestionFeedbackFrame( const QuicCongestionFeedbackFrame& feedback, - QuicTime feedback_receive_time) OVERRIDE; + QuicTime feedback_receive_time) override; virtual void OnCongestionEvent(bool rtt_updated, QuicByteCount bytes_in_flight, const CongestionVector& acked_packets, - const CongestionVector& lost_packets) OVERRIDE; + const CongestionVector& lost_packets) override; virtual bool OnPacketSent(QuicTime sent_time, QuicByteCount bytes_in_flight, QuicPacketSequenceNumber sequence_number, QuicByteCount bytes, - HasRetransmittableData is_retransmittable) OVERRIDE; - virtual void OnRetransmissionTimeout(bool packets_retransmitted) OVERRIDE; - virtual void RevertRetransmissionTimeout() OVERRIDE; + HasRetransmittableData is_retransmittable) override; + virtual void OnRetransmissionTimeout(bool packets_retransmitted) override; + virtual void RevertRetransmissionTimeout() override; virtual QuicTime::Delta TimeUntilSend( QuicTime now, QuicByteCount bytes_in_flight, - HasRetransmittableData has_retransmittable_data) const OVERRIDE; - virtual QuicBandwidth BandwidthEstimate() const OVERRIDE; - virtual bool HasReliableBandwidthEstimate() const OVERRIDE; - virtual QuicTime::Delta RetransmissionDelay() const OVERRIDE; - virtual QuicByteCount GetCongestionWindow() const OVERRIDE; - virtual bool InSlowStart() const OVERRIDE; - virtual bool InRecovery() const OVERRIDE; - virtual QuicByteCount GetSlowStartThreshold() const OVERRIDE; - virtual CongestionControlType GetCongestionControlType() const OVERRIDE; + HasRetransmittableData has_retransmittable_data) const override; + virtual QuicBandwidth BandwidthEstimate() const override; + virtual bool HasReliableBandwidthEstimate() const override; + virtual QuicTime::Delta RetransmissionDelay() const override; + virtual QuicByteCount GetCongestionWindow() const override; + virtual bool InSlowStart() const override; + virtual bool InRecovery() const override; + virtual QuicByteCount GetSlowStartThreshold() const override; + virtual CongestionControlType GetCongestionControlType() const override; private: scoped_ptr<SendAlgorithmInterface> sender_; // Underlying sender. diff --git a/net/quic/congestion_control/tcp_cubic_sender.h b/net/quic/congestion_control/tcp_cubic_sender.h index 8851ac4..dd0df58 100644 --- a/net/quic/congestion_control/tcp_cubic_sender.h +++ b/net/quic/congestion_control/tcp_cubic_sender.h @@ -38,34 +38,34 @@ class NET_EXPORT_PRIVATE TcpCubicSender : public SendAlgorithmInterface { virtual ~TcpCubicSender(); // Start implementation of SendAlgorithmInterface. - virtual void SetFromConfig(const QuicConfig& config, bool is_server) OVERRIDE; - virtual void SetNumEmulatedConnections(int num_connections) OVERRIDE; + virtual void SetFromConfig(const QuicConfig& config, bool is_server) override; + virtual void SetNumEmulatedConnections(int num_connections) override; virtual void OnIncomingQuicCongestionFeedbackFrame( const QuicCongestionFeedbackFrame& feedback, - QuicTime feedback_receive_time) OVERRIDE; + QuicTime feedback_receive_time) override; virtual void OnCongestionEvent(bool rtt_updated, QuicByteCount bytes_in_flight, const CongestionVector& acked_packets, - const CongestionVector& lost_packets) OVERRIDE; + const CongestionVector& lost_packets) override; virtual bool OnPacketSent(QuicTime sent_time, QuicByteCount bytes_in_flight, QuicPacketSequenceNumber sequence_number, QuicByteCount bytes, - HasRetransmittableData is_retransmittable) OVERRIDE; - virtual void OnRetransmissionTimeout(bool packets_retransmitted) OVERRIDE; - virtual void RevertRetransmissionTimeout() OVERRIDE; + HasRetransmittableData is_retransmittable) override; + virtual void OnRetransmissionTimeout(bool packets_retransmitted) override; + virtual void RevertRetransmissionTimeout() override; virtual QuicTime::Delta TimeUntilSend( QuicTime now, QuicByteCount bytes_in_flight, - HasRetransmittableData has_retransmittable_data) const OVERRIDE; - virtual QuicBandwidth BandwidthEstimate() const OVERRIDE; - virtual bool HasReliableBandwidthEstimate() const OVERRIDE; - virtual QuicTime::Delta RetransmissionDelay() const OVERRIDE; - virtual QuicByteCount GetCongestionWindow() const OVERRIDE; - virtual bool InSlowStart() const OVERRIDE; - virtual bool InRecovery() const OVERRIDE; - virtual QuicByteCount GetSlowStartThreshold() const OVERRIDE; - virtual CongestionControlType GetCongestionControlType() const OVERRIDE; + HasRetransmittableData has_retransmittable_data) const override; + virtual QuicBandwidth BandwidthEstimate() const override; + virtual bool HasReliableBandwidthEstimate() const override; + virtual QuicTime::Delta RetransmissionDelay() const override; + virtual QuicByteCount GetCongestionWindow() const override; + virtual bool InSlowStart() const override; + virtual bool InRecovery() const override; + virtual QuicByteCount GetSlowStartThreshold() const override; + virtual CongestionControlType GetCongestionControlType() const override; // End implementation of SendAlgorithmInterface. private: diff --git a/net/quic/congestion_control/tcp_loss_algorithm.h b/net/quic/congestion_control/tcp_loss_algorithm.h index 5f0bcfb..201354b 100644 --- a/net/quic/congestion_control/tcp_loss_algorithm.h +++ b/net/quic/congestion_control/tcp_loss_algorithm.h @@ -23,17 +23,17 @@ class NET_EXPORT_PRIVATE TCPLossAlgorithm : public LossDetectionInterface { TCPLossAlgorithm(); virtual ~TCPLossAlgorithm() {} - virtual LossDetectionType GetLossDetectionType() const OVERRIDE; + virtual LossDetectionType GetLossDetectionType() const override; // Uses nack counts to decide when packets are lost. virtual SequenceNumberSet DetectLostPackets( const QuicUnackedPacketMap& unacked_packets, const QuicTime& time, QuicPacketSequenceNumber largest_observed, - const RttStats& rtt_stats) OVERRIDE; + const RttStats& rtt_stats) override; // Returns a non-zero value when the early retransmit timer is active. - virtual QuicTime GetLossTimeout() const OVERRIDE; + virtual QuicTime GetLossTimeout() const override; private: QuicTime loss_detection_timeout_; diff --git a/net/quic/congestion_control/tcp_receiver.h b/net/quic/congestion_control/tcp_receiver.h index a5e5b1b..89e9186 100644 --- a/net/quic/congestion_control/tcp_receiver.h +++ b/net/quic/congestion_control/tcp_receiver.h @@ -25,11 +25,11 @@ class NET_EXPORT_PRIVATE TcpReceiver : public ReceiveAlgorithmInterface { // Start implementation of SendAlgorithmInterface. virtual bool GenerateCongestionFeedback( - QuicCongestionFeedbackFrame* feedback) OVERRIDE; + QuicCongestionFeedbackFrame* feedback) override; virtual void RecordIncomingPacket(QuicByteCount bytes, QuicPacketSequenceNumber sequence_number, - QuicTime timestamp) OVERRIDE; + QuicTime timestamp) override; private: QuicByteCount receive_window_; diff --git a/net/quic/congestion_control/time_loss_algorithm.h b/net/quic/congestion_control/time_loss_algorithm.h index ae37e1e..de517ef 100644 --- a/net/quic/congestion_control/time_loss_algorithm.h +++ b/net/quic/congestion_control/time_loss_algorithm.h @@ -23,7 +23,7 @@ class NET_EXPORT_PRIVATE TimeLossAlgorithm : public LossDetectionInterface { TimeLossAlgorithm(); virtual ~TimeLossAlgorithm() {} - virtual LossDetectionType GetLossDetectionType() const OVERRIDE; + virtual LossDetectionType GetLossDetectionType() const override; // Declares pending packets less than the largest observed lost when it has // been 1.25 RTT since they were sent. Packets larger than the largest @@ -32,14 +32,14 @@ class NET_EXPORT_PRIVATE TimeLossAlgorithm : public LossDetectionInterface { const QuicUnackedPacketMap& unacked_packets, const QuicTime& time, QuicPacketSequenceNumber largest_observed, - const RttStats& rtt_stats) OVERRIDE; + const RttStats& rtt_stats) override; // Returns the time the next packet will be lost, or zero if there // are no nacked pending packets outstanding. // TODO(ianswett): Ideally the RTT variance and the RTT would be used to // determine the time a packet is considered lost. // TODO(ianswett): Consider using Max(1.25 * srtt, 1.125 * last_rtt). - virtual QuicTime GetLossTimeout() const OVERRIDE; + virtual QuicTime GetLossTimeout() const override; private: QuicTime loss_detection_timeout_; diff --git a/net/quic/crypto/aead_base_decrypter.h b/net/quic/crypto/aead_base_decrypter.h index 6257409..116dbe1 100644 --- a/net/quic/crypto/aead_base_decrypter.h +++ b/net/quic/crypto/aead_base_decrypter.h @@ -40,18 +40,18 @@ class NET_EXPORT_PRIVATE AeadBaseDecrypter : public QuicDecrypter { virtual ~AeadBaseDecrypter(); // QuicDecrypter implementation - virtual bool SetKey(base::StringPiece key) OVERRIDE; - virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) OVERRIDE; + virtual bool SetKey(base::StringPiece key) override; + virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) override; virtual bool Decrypt(base::StringPiece nonce, base::StringPiece associated_data, base::StringPiece ciphertext, unsigned char* output, - size_t* output_length) OVERRIDE; + size_t* output_length) override; virtual QuicData* DecryptPacket(QuicPacketSequenceNumber sequence_number, base::StringPiece associated_data, - base::StringPiece ciphertext) OVERRIDE; - virtual base::StringPiece GetKey() const OVERRIDE; - virtual base::StringPiece GetNoncePrefix() const OVERRIDE; + base::StringPiece ciphertext) override; + virtual base::StringPiece GetKey() const override; + virtual base::StringPiece GetNoncePrefix() const override; protected: // Make these constants available to the subclasses so that the subclasses diff --git a/net/quic/crypto/aead_base_encrypter.h b/net/quic/crypto/aead_base_encrypter.h index 7138131..89c7a1f 100644 --- a/net/quic/crypto/aead_base_encrypter.h +++ b/net/quic/crypto/aead_base_encrypter.h @@ -40,21 +40,21 @@ class NET_EXPORT_PRIVATE AeadBaseEncrypter : public QuicEncrypter { virtual ~AeadBaseEncrypter(); // QuicEncrypter implementation - virtual bool SetKey(base::StringPiece key) OVERRIDE; - virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) OVERRIDE; + virtual bool SetKey(base::StringPiece key) override; + virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) override; virtual bool Encrypt(base::StringPiece nonce, base::StringPiece associated_data, base::StringPiece plaintext, - unsigned char* output) OVERRIDE; + unsigned char* output) override; virtual QuicData* EncryptPacket(QuicPacketSequenceNumber sequence_number, base::StringPiece associated_data, - base::StringPiece plaintext) OVERRIDE; - virtual size_t GetKeySize() const OVERRIDE; - virtual size_t GetNoncePrefixSize() const OVERRIDE; - virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const OVERRIDE; - virtual size_t GetCiphertextSize(size_t plaintext_size) const OVERRIDE; - virtual base::StringPiece GetKey() const OVERRIDE; - virtual base::StringPiece GetNoncePrefix() const OVERRIDE; + base::StringPiece plaintext) override; + virtual size_t GetKeySize() const override; + virtual size_t GetNoncePrefixSize() const override; + virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const override; + virtual size_t GetCiphertextSize(size_t plaintext_size) const override; + virtual base::StringPiece GetKey() const override; + virtual base::StringPiece GetNoncePrefix() const override; protected: // Make these constants available to the subclasses so that the subclasses diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter.h b/net/quic/crypto/aes_128_gcm_12_decrypter.h index 0511c8b..4395dc2 100644 --- a/net/quic/crypto/aes_128_gcm_12_decrypter.h +++ b/net/quic/crypto/aes_128_gcm_12_decrypter.h @@ -31,7 +31,7 @@ class NET_EXPORT_PRIVATE Aes128Gcm12Decrypter : public AeadBaseDecrypter { virtual void FillAeadParams(base::StringPiece nonce, base::StringPiece associated_data, size_t auth_tag_size, - AeadParams* aead_params) const OVERRIDE; + AeadParams* aead_params) const override; #endif private: diff --git a/net/quic/crypto/aes_128_gcm_12_encrypter.h b/net/quic/crypto/aes_128_gcm_12_encrypter.h index 1d8f321..afbeb14 100644 --- a/net/quic/crypto/aes_128_gcm_12_encrypter.h +++ b/net/quic/crypto/aes_128_gcm_12_encrypter.h @@ -31,7 +31,7 @@ class NET_EXPORT_PRIVATE Aes128Gcm12Encrypter : public AeadBaseEncrypter { virtual void FillAeadParams(base::StringPiece nonce, base::StringPiece associated_data, size_t auth_tag_size, - AeadParams* aead_params) const OVERRIDE; + AeadParams* aead_params) const override; #endif private: diff --git a/net/quic/crypto/chacha20_poly1305_decrypter.h b/net/quic/crypto/chacha20_poly1305_decrypter.h index 9d24ba2..e3c3e7f 100644 --- a/net/quic/crypto/chacha20_poly1305_decrypter.h +++ b/net/quic/crypto/chacha20_poly1305_decrypter.h @@ -35,7 +35,7 @@ class NET_EXPORT_PRIVATE ChaCha20Poly1305Decrypter : public AeadBaseDecrypter { virtual void FillAeadParams(base::StringPiece nonce, base::StringPiece associated_data, size_t auth_tag_size, - AeadParams* aead_params) const OVERRIDE; + AeadParams* aead_params) const override; #endif private: diff --git a/net/quic/crypto/chacha20_poly1305_encrypter.h b/net/quic/crypto/chacha20_poly1305_encrypter.h index 4a68caa..b99fa27 100644 --- a/net/quic/crypto/chacha20_poly1305_encrypter.h +++ b/net/quic/crypto/chacha20_poly1305_encrypter.h @@ -35,7 +35,7 @@ class NET_EXPORT_PRIVATE ChaCha20Poly1305Encrypter : public AeadBaseEncrypter { virtual void FillAeadParams(base::StringPiece nonce, base::StringPiece associated_data, size_t auth_tag_size, - AeadParams* aead_params) const OVERRIDE; + AeadParams* aead_params) const override; #endif private: diff --git a/net/quic/crypto/channel_id_chromium.h b/net/quic/crypto/channel_id_chromium.h index 08cfff9..72f694d6 100644 --- a/net/quic/crypto/channel_id_chromium.h +++ b/net/quic/crypto/channel_id_chromium.h @@ -24,8 +24,8 @@ class NET_EXPORT_PRIVATE ChannelIDKeyChromium: public ChannelIDKey { // ChannelIDKey interface virtual bool Sign(base::StringPiece signed_data, - std::string* out_signature) const OVERRIDE; - virtual std::string SerializeKey() const OVERRIDE; + std::string* out_signature) const override; + virtual std::string SerializeKey() const override; private: scoped_ptr<crypto::ECPrivateKey> ec_private_key_; @@ -42,7 +42,7 @@ class ChannelIDSourceChromium : public ChannelIDSource { virtual QuicAsyncStatus GetChannelIDKey( const std::string& hostname, scoped_ptr<ChannelIDKey>* channel_id_key, - ChannelIDSourceCallback* callback) OVERRIDE; + ChannelIDSourceCallback* callback) override; private: class Job; diff --git a/net/quic/crypto/common_cert_set.cc b/net/quic/crypto/common_cert_set.cc index f631cd6..0d39ecc 100644 --- a/net/quic/crypto/common_cert_set.cc +++ b/net/quic/crypto/common_cert_set.cc @@ -69,12 +69,12 @@ int Compare(StringPiece a, const unsigned char* b, size_t b_len) { class CommonCertSetsQUIC : public CommonCertSets { public: // CommonCertSets interface. - virtual StringPiece GetCommonHashes() const OVERRIDE { + virtual StringPiece GetCommonHashes() const override { return StringPiece(reinterpret_cast<const char*>(kSetHashes), sizeof(uint64) * arraysize(kSetHashes)); } - virtual StringPiece GetCert(uint64 hash, uint32 index) const OVERRIDE { + virtual StringPiece GetCert(uint64 hash, uint32 index) const override { for (size_t i = 0; i < arraysize(kSets); i++) { if (kSets[i].hash == hash) { if (index < kSets[i].num_certs) { @@ -90,7 +90,7 @@ class CommonCertSetsQUIC : public CommonCertSets { } virtual bool MatchCert(StringPiece cert, StringPiece common_set_hashes, - uint64* out_hash, uint32* out_index) const OVERRIDE { + uint64* out_hash, uint32* out_index) const override { if (common_set_hashes.size() % sizeof(uint64) != 0) { return false; } diff --git a/net/quic/crypto/crypto_framer.cc b/net/quic/crypto/crypto_framer.cc index bc5c8b7..3f61115 100644 --- a/net/quic/crypto/crypto_framer.cc +++ b/net/quic/crypto/crypto_framer.cc @@ -26,10 +26,10 @@ class OneShotVisitor : public CryptoFramerVisitorInterface { public: OneShotVisitor() : error_(false) {} - virtual void OnError(CryptoFramer* framer) OVERRIDE { error_ = true; } + virtual void OnError(CryptoFramer* framer) override { error_ = true; } virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE { + const CryptoHandshakeMessage& message) override { out_.reset(new CryptoHandshakeMessage(message)); } diff --git a/net/quic/crypto/crypto_framer_test.cc b/net/quic/crypto/crypto_framer_test.cc index 01e9157..f9ea55d 100644 --- a/net/quic/crypto/crypto_framer_test.cc +++ b/net/quic/crypto/crypto_framer_test.cc @@ -33,13 +33,13 @@ class TestCryptoVisitor : public ::net::CryptoFramerVisitorInterface { public: TestCryptoVisitor() : error_count_(0) {} - virtual void OnError(CryptoFramer* framer) OVERRIDE { + virtual void OnError(CryptoFramer* framer) override { DLOG(ERROR) << "CryptoFramer Error: " << framer->error(); ++error_count_; } virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE { + const CryptoHandshakeMessage& message) override { messages_.push_back(message); } diff --git a/net/quic/crypto/crypto_server_test.cc b/net/quic/crypto/crypto_server_test.cc index bb47cbf..1f3380a 100644 --- a/net/quic/crypto/crypto_server_test.cc +++ b/net/quic/crypto/crypto_server_test.cc @@ -156,7 +156,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> { } virtual void RunImpl(const CryptoHandshakeMessage& client_hello, - const Result& result) OVERRIDE { + const Result& result) override { { // Ensure that the strike register client lock is not held. QuicCryptoServerConfigPeer peer(&test_->config_); diff --git a/net/quic/crypto/curve25519_key_exchange.h b/net/quic/crypto/curve25519_key_exchange.h index 93288f6..310c614 100644 --- a/net/quic/crypto/curve25519_key_exchange.h +++ b/net/quic/crypto/curve25519_key_exchange.h @@ -31,11 +31,11 @@ class NET_EXPORT_PRIVATE Curve25519KeyExchange : public KeyExchange { static std::string NewPrivateKey(QuicRandom* rand); // KeyExchange interface. - virtual KeyExchange* NewKeyPair(QuicRandom* rand) const OVERRIDE; + virtual KeyExchange* NewKeyPair(QuicRandom* rand) const override; virtual bool CalculateSharedKey(const base::StringPiece& peer_public_value, - std::string* shared_key) const OVERRIDE; - virtual base::StringPiece public_value() const OVERRIDE; - virtual QuicTag tag() const OVERRIDE; + std::string* shared_key) const override; + virtual base::StringPiece public_value() const override; + virtual QuicTag tag() const override; private: Curve25519KeyExchange(); diff --git a/net/quic/crypto/local_strike_register_client.h b/net/quic/crypto/local_strike_register_client.h index fe8ae93..b121299 100644 --- a/net/quic/crypto/local_strike_register_client.h +++ b/net/quic/crypto/local_strike_register_client.h @@ -26,10 +26,10 @@ class NET_EXPORT_PRIVATE LocalStrikeRegisterClient const uint8 orbit[8], StrikeRegister::StartupType startup); - virtual bool IsKnownOrbit(base::StringPiece orbit) const OVERRIDE; + virtual bool IsKnownOrbit(base::StringPiece orbit) const override; virtual void VerifyNonceIsValidAndUnique(base::StringPiece nonce, QuicWallTime now, - ResultCallback* cb) OVERRIDE; + ResultCallback* cb) override; private: mutable base::Lock m_; diff --git a/net/quic/crypto/local_strike_register_client_test.cc b/net/quic/crypto/local_strike_register_client_test.cc index 1a3b6f9..70d2428 100644 --- a/net/quic/crypto/local_strike_register_client_test.cc +++ b/net/quic/crypto/local_strike_register_client_test.cc @@ -36,7 +36,7 @@ class RecordResultCallback : public StrikeRegisterClient::ResultCallback { protected: virtual void RunImpl(bool nonce_is_valid_and_unique, - InsertStatus nonce_error) OVERRIDE { + InsertStatus nonce_error) override { *called_ = true; *saved_value_ = nonce_is_valid_and_unique; *saved_nonce_error_ = nonce_error; diff --git a/net/quic/crypto/null_decrypter.h b/net/quic/crypto/null_decrypter.h index 2bc2fe8..03038bd 100644 --- a/net/quic/crypto/null_decrypter.h +++ b/net/quic/crypto/null_decrypter.h @@ -22,18 +22,18 @@ class NET_EXPORT_PRIVATE NullDecrypter : public QuicDecrypter { virtual ~NullDecrypter() {} // QuicDecrypter implementation - virtual bool SetKey(base::StringPiece key) OVERRIDE; - virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) OVERRIDE; + virtual bool SetKey(base::StringPiece key) override; + virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) override; virtual bool Decrypt(base::StringPiece nonce, base::StringPiece associated_data, base::StringPiece ciphertext, unsigned char* output, - size_t* output_length) OVERRIDE; + size_t* output_length) override; virtual QuicData* DecryptPacket(QuicPacketSequenceNumber sequence_number, base::StringPiece associated_data, - base::StringPiece ciphertext) OVERRIDE; - virtual base::StringPiece GetKey() const OVERRIDE; - virtual base::StringPiece GetNoncePrefix() const OVERRIDE; + base::StringPiece ciphertext) override; + virtual base::StringPiece GetKey() const override; + virtual base::StringPiece GetNoncePrefix() const override; private: bool ReadHash(QuicDataReader* reader, uint128* hash); diff --git a/net/quic/crypto/null_encrypter.h b/net/quic/crypto/null_encrypter.h index 1bcdff5..fbd2dff 100644 --- a/net/quic/crypto/null_encrypter.h +++ b/net/quic/crypto/null_encrypter.h @@ -20,21 +20,21 @@ class NET_EXPORT_PRIVATE NullEncrypter : public QuicEncrypter { virtual ~NullEncrypter() {} // QuicEncrypter implementation - virtual bool SetKey(base::StringPiece key) OVERRIDE; - virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) OVERRIDE; + virtual bool SetKey(base::StringPiece key) override; + virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) override; virtual bool Encrypt(base::StringPiece nonce, base::StringPiece associated_data, base::StringPiece plaintext, - unsigned char* output) OVERRIDE; + unsigned char* output) override; virtual QuicData* EncryptPacket(QuicPacketSequenceNumber sequence_number, base::StringPiece associated_data, - base::StringPiece plaintext) OVERRIDE; - virtual size_t GetKeySize() const OVERRIDE; - virtual size_t GetNoncePrefixSize() const OVERRIDE; - virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const OVERRIDE; - virtual size_t GetCiphertextSize(size_t plaintext_size) const OVERRIDE; - virtual base::StringPiece GetKey() const OVERRIDE; - virtual base::StringPiece GetNoncePrefix() const OVERRIDE; + base::StringPiece plaintext) override; + virtual size_t GetKeySize() const override; + virtual size_t GetNoncePrefixSize() const override; + virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const override; + virtual size_t GetCiphertextSize(size_t plaintext_size) const override; + virtual base::StringPiece GetKey() const override; + virtual base::StringPiece GetNoncePrefix() const override; private: size_t GetHashLength() const; diff --git a/net/quic/crypto/p256_key_exchange.h b/net/quic/crypto/p256_key_exchange.h index ce5a0d4..36ba296 100644 --- a/net/quic/crypto/p256_key_exchange.h +++ b/net/quic/crypto/p256_key_exchange.h @@ -38,11 +38,11 @@ class NET_EXPORT_PRIVATE P256KeyExchange : public KeyExchange { static std::string NewPrivateKey(); // KeyExchange interface. - virtual KeyExchange* NewKeyPair(QuicRandom* rand) const OVERRIDE; + virtual KeyExchange* NewKeyPair(QuicRandom* rand) const override; virtual bool CalculateSharedKey(const base::StringPiece& peer_public_value, - std::string* shared_key) const OVERRIDE; - virtual base::StringPiece public_value() const OVERRIDE; - virtual QuicTag tag() const OVERRIDE; + std::string* shared_key) const override; + virtual base::StringPiece public_value() const override; + virtual QuicTag tag() const override; private: enum { diff --git a/net/quic/crypto/proof_source_chromium.h b/net/quic/crypto/proof_source_chromium.h index 70ab92d..3d1849e 100644 --- a/net/quic/crypto/proof_source_chromium.h +++ b/net/quic/crypto/proof_source_chromium.h @@ -27,7 +27,7 @@ class NET_EXPORT_PRIVATE ProofSourceChromium : public ProofSource { const std::string& server_config, bool ecdsa_ok, const std::vector<std::string>** out_certs, - std::string* out_signature) OVERRIDE; + std::string* out_signature) override; private: DISALLOW_COPY_AND_ASSIGN(ProofSourceChromium); diff --git a/net/quic/crypto/proof_test.cc b/net/quic/crypto/proof_test.cc index 031cba28..0dde97c 100644 --- a/net/quic/crypto/proof_test.cc +++ b/net/quic/crypto/proof_test.cc @@ -40,7 +40,7 @@ class TestProofVerifierCallback : public ProofVerifierCallback { virtual void Run(bool ok, const string& error_details, - scoped_ptr<ProofVerifyDetails>* details) OVERRIDE { + scoped_ptr<ProofVerifyDetails>* details) override { *ok_ = ok; *error_details_ = error_details; diff --git a/net/quic/crypto/proof_verifier_chromium.h b/net/quic/crypto/proof_verifier_chromium.h index 7b305e2..057cc16 100644 --- a/net/quic/crypto/proof_verifier_chromium.h +++ b/net/quic/crypto/proof_verifier_chromium.h @@ -30,7 +30,7 @@ class NET_EXPORT_PRIVATE ProofVerifyDetailsChromium public: // ProofVerifyDetails implementation - virtual ProofVerifyDetails* Clone() const OVERRIDE; + virtual ProofVerifyDetails* Clone() const override; CertVerifyResult cert_verify_result; @@ -67,7 +67,7 @@ class NET_EXPORT_PRIVATE ProofVerifierChromium : public ProofVerifier { const ProofVerifyContext* verify_context, std::string* error_details, scoped_ptr<ProofVerifyDetails>* verify_details, - ProofVerifierCallback* callback) OVERRIDE; + ProofVerifierCallback* callback) override; private: class Job; diff --git a/net/quic/crypto/quic_crypto_client_config_test.cc b/net/quic/crypto/quic_crypto_client_config_test.cc index b02243b..31eb5fa 100644 --- a/net/quic/crypto/quic_crypto_client_config_test.cc +++ b/net/quic/crypto/quic_crypto_client_config_test.cc @@ -21,7 +21,7 @@ class TestProofVerifyDetails : public ProofVerifyDetails { virtual ~TestProofVerifyDetails() {} // ProofVerifyDetails implementation - virtual ProofVerifyDetails* Clone() const OVERRIDE { + virtual ProofVerifyDetails* Clone() const override { return new TestProofVerifyDetails; } }; diff --git a/net/quic/crypto/quic_crypto_server_config.cc b/net/quic/crypto/quic_crypto_server_config.cc index 6281043..29670cd 100644 --- a/net/quic/crypto/quic_crypto_server_config.cc +++ b/net/quic/crypto/quic_crypto_server_config.cc @@ -150,7 +150,7 @@ class VerifyNonceIsValidAndUniqueCallback protected: virtual void RunImpl(bool nonce_is_valid_and_unique, - InsertStatus nonce_error) OVERRIDE { + InsertStatus nonce_error) override { DVLOG(1) << "Using client nonce, unique: " << nonce_is_valid_and_unique << " nonce_error: " << nonce_error; result_->info.unique = nonce_is_valid_and_unique; diff --git a/net/quic/crypto/quic_crypto_server_config_test.cc b/net/quic/crypto/quic_crypto_server_config_test.cc index f44dc5c..179b6ac 100644 --- a/net/quic/crypto/quic_crypto_server_config_test.cc +++ b/net/quic/crypto/quic_crypto_server_config_test.cc @@ -188,7 +188,7 @@ class TestStrikeRegisterClient : public StrikeRegisterClient { is_known_orbit_called_(false) { } - virtual bool IsKnownOrbit(StringPiece orbit) const OVERRIDE { + virtual bool IsKnownOrbit(StringPiece orbit) const override { // Ensure that the strike register client lock is not held. QuicCryptoServerConfigPeer peer(config_); base::Lock* m = peer.GetStrikeRegisterClientLock(); @@ -204,7 +204,7 @@ class TestStrikeRegisterClient : public StrikeRegisterClient { virtual void VerifyNonceIsValidAndUnique( StringPiece nonce, QuicWallTime now, - ResultCallback* cb) OVERRIDE { + ResultCallback* cb) override { LOG(FATAL) << "Not implemented"; } diff --git a/net/quic/crypto/quic_random.cc b/net/quic/crypto/quic_random.cc index 6f46013..bc85c2d 100644 --- a/net/quic/crypto/quic_random.cc +++ b/net/quic/crypto/quic_random.cc @@ -17,10 +17,10 @@ class DefaultRandom : public QuicRandom { static DefaultRandom* GetInstance(); // QuicRandom implementation - virtual void RandBytes(void* data, size_t len) OVERRIDE; - virtual uint64 RandUint64() OVERRIDE; + virtual void RandBytes(void* data, size_t len) override; + virtual uint64 RandUint64() override; virtual void Reseed(const void* additional_entropy, - size_t entropy_len) OVERRIDE; + size_t entropy_len) override; private: DefaultRandom() {}; diff --git a/net/quic/quic_alarm_test.cc b/net/quic/quic_alarm_test.cc index 434bb38..47e23e3 100644 --- a/net/quic/quic_alarm_test.cc +++ b/net/quic/quic_alarm_test.cc @@ -32,12 +32,12 @@ class TestAlarm : public QuicAlarm { } protected: - virtual void SetImpl() OVERRIDE { + virtual void SetImpl() override { DCHECK(deadline().IsInitialized()); scheduled_ = true; } - virtual void CancelImpl() OVERRIDE { + virtual void CancelImpl() override { DCHECK(!deadline().IsInitialized()); scheduled_ = false; } diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h index fa712c2..430ef52 100644 --- a/net/quic/quic_client_session.h +++ b/net/quic/quic_client_session.h @@ -124,30 +124,30 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase { // QuicSession methods: virtual void OnStreamFrames( - const std::vector<QuicStreamFrame>& frames) OVERRIDE; - virtual QuicReliableClientStream* CreateOutgoingDataStream() OVERRIDE; - virtual QuicCryptoClientStream* GetCryptoStream() OVERRIDE; - virtual void CloseStream(QuicStreamId stream_id) OVERRIDE; + const std::vector<QuicStreamFrame>& frames) override; + virtual QuicReliableClientStream* CreateOutgoingDataStream() override; + virtual QuicCryptoClientStream* GetCryptoStream() override; + virtual void CloseStream(QuicStreamId stream_id) override; virtual void SendRstStream(QuicStreamId id, QuicRstStreamErrorCode error, - QuicStreamOffset bytes_written) OVERRIDE; - virtual void OnCryptoHandshakeEvent(CryptoHandshakeEvent event) OVERRIDE; + QuicStreamOffset bytes_written) override; + virtual void OnCryptoHandshakeEvent(CryptoHandshakeEvent event) override; virtual void OnCryptoHandshakeMessageSent( - const CryptoHandshakeMessage& message) OVERRIDE; + const CryptoHandshakeMessage& message) override; virtual void OnCryptoHandshakeMessageReceived( - const CryptoHandshakeMessage& message) OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) const OVERRIDE; + const CryptoHandshakeMessage& message) override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) const override; // QuicClientSessionBase methods: virtual void OnProofValid( - const QuicCryptoClientConfig::CachedState& cached) OVERRIDE; + const QuicCryptoClientConfig::CachedState& cached) override; virtual void OnProofVerifyDetailsAvailable( - const ProofVerifyDetails& verify_details) OVERRIDE; + const ProofVerifyDetails& verify_details) override; // QuicConnectionVisitorInterface methods: - virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE; + virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) override; virtual void OnSuccessfulVersionNegotiation( - const QuicVersion& version) OVERRIDE; + const QuicVersion& version) override; // Performs a crypto handshake with the server. int CryptoConnect(bool require_confirmation, @@ -182,7 +182,7 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase { protected: // QuicSession methods: - virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE; + virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) override; private: friend class test::QuicClientSessionPeer; diff --git a/net/quic/quic_client_session_base.h b/net/quic/quic_client_session_base.h index 834d006..ae0644e 100644 --- a/net/quic/quic_client_session_base.h +++ b/net/quic/quic_client_session_base.h @@ -33,7 +33,7 @@ class NET_EXPORT_PRIVATE QuicClientSessionBase : public QuicSession { const ProofVerifyDetails& verify_details) = 0; // Override base class to set FEC policy before any data is sent by client. - virtual void OnCryptoHandshakeEvent(CryptoHandshakeEvent event) OVERRIDE; + virtual void OnCryptoHandshakeEvent(CryptoHandshakeEvent event) override; private: DISALLOW_COPY_AND_ASSIGN(QuicClientSessionBase); diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc index 9758ed4..834ebe6 100644 --- a/net/quic/quic_client_session_test.cc +++ b/net/quic/quic_client_session_test.cc @@ -55,7 +55,7 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> { crypto_config_.SetDefaults(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { session_.CloseSessionOnError(ERR_ABORTED); } diff --git a/net/quic/quic_config.h b/net/quic/quic_config.h index 203eb2e..a9681fb 100644 --- a/net/quic/quic_config.h +++ b/net/quic/quic_config.h @@ -89,7 +89,7 @@ class NET_EXPORT_PRIVATE QuicNegotiableUint32 : public QuicNegotiableValue { // Serialises |name_| and value to |out|. If |negotiated_| is true then // |negotiated_value_| is serialised, otherwise |max_value_| is serialised. - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const OVERRIDE; + virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override; // Sets |negotiated_value_| to the minimum of |max_value_| and the // corresponding value from |peer_hello|. If the corresponding value is @@ -98,7 +98,7 @@ class NET_EXPORT_PRIVATE QuicNegotiableUint32 : public QuicNegotiableValue { virtual QuicErrorCode ProcessPeerHello( const CryptoHandshakeMessage& peer_hello, HelloType hello_type, - std::string* error_details) OVERRIDE; + std::string* error_details) override; private: uint32 max_value_; @@ -123,7 +123,7 @@ class NET_EXPORT_PRIVATE QuicNegotiableTag : public QuicNegotiableValue { // Serialises |name_| and vector (either possible or negotiated) to |out|. If // |negotiated_| is true then |negotiated_tag_| is serialised, otherwise // |possible_values_| is serialised. - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const OVERRIDE; + virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override; // Selects the tag common to both tags in |client_hello| for |name_| and // |possible_values_| with preference to tag in |possible_values_|. The @@ -131,7 +131,7 @@ class NET_EXPORT_PRIVATE QuicNegotiableTag : public QuicNegotiableValue { virtual QuicErrorCode ProcessPeerHello( const CryptoHandshakeMessage& peer_hello, HelloType hello_type, - std::string* error_details) OVERRIDE; + std::string* error_details) override; private: // Reads the vector corresponding to |name_| from |msg| into |out|. If the @@ -166,13 +166,13 @@ class NET_EXPORT_PRIVATE QuicFixedUint32 : public QuicConfigValue { void SetReceivedValue(uint32 value); // If has_send_value is true, serialises |tag_| and |send_value_| to |out|. - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const OVERRIDE; + virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override; // Sets |value_| to the corresponding value from |peer_hello_| if it exists. virtual QuicErrorCode ProcessPeerHello( const CryptoHandshakeMessage& peer_hello, HelloType hello_type, - std::string* error_details) OVERRIDE; + std::string* error_details) override; private: uint32 send_value_; @@ -200,13 +200,13 @@ class NET_EXPORT_PRIVATE QuicFixedTag : public QuicConfigValue { void SetReceivedValue(QuicTag value); // If has_send_value is true, serialises |tag_| and |send_value_| to |out|. - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const OVERRIDE; + virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override; // Sets |value_| to the corresponding value from |client_hello_| if it exists. virtual QuicErrorCode ProcessPeerHello( const CryptoHandshakeMessage& peer_hello, HelloType hello_type, - std::string* error_details) OVERRIDE; + std::string* error_details) override; private: QuicTag send_value_; @@ -235,14 +235,14 @@ class NET_EXPORT_PRIVATE QuicFixedTagVector : public QuicConfigValue { // If has_send_value is true, serialises |tag_vector_| and |send_value_| to // |out|. - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const OVERRIDE; + virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override; // Sets |receive_values_| to the corresponding value from |client_hello_| if // it exists. virtual QuicErrorCode ProcessPeerHello( const CryptoHandshakeMessage& peer_hello, HelloType hello_type, - std::string* error_details) OVERRIDE; + std::string* error_details) override; private: QuicTagVector send_values_; diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc index 8d49010..b4d0219 100644 --- a/net/quic/quic_connection.cc +++ b/net/quic/quic_connection.cc @@ -72,7 +72,7 @@ class AckAlarm : public QuicAlarm::Delegate { : connection_(connection) { } - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { connection_->SendAck(); return QuicTime::Zero(); } @@ -92,7 +92,7 @@ class RetransmissionAlarm : public QuicAlarm::Delegate { : connection_(connection) { } - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { connection_->OnRetransmissionTimeout(); return QuicTime::Zero(); } @@ -111,7 +111,7 @@ class SendAlarm : public QuicAlarm::Delegate { : connection_(connection) { } - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { connection_->WriteIfNotBlocked(); // Never reschedule the alarm, since CanWrite does that. return QuicTime::Zero(); @@ -129,7 +129,7 @@ class TimeoutAlarm : public QuicAlarm::Delegate { : connection_(connection) { } - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { connection_->CheckForTimeout(); // Never reschedule the alarm, since CheckForTimeout does that. return QuicTime::Zero(); @@ -147,7 +147,7 @@ class PingAlarm : public QuicAlarm::Delegate { : connection_(connection) { } - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { connection_->SendPing(); return QuicTime::Zero(); } diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h index 0b017b0..107a531 100644 --- a/net/quic/quic_connection.h +++ b/net/quic/quic_connection.h @@ -299,7 +299,7 @@ class NET_EXPORT_PRIVATE QuicConnection virtual void SendConnectionCloseWithDetails(QuicErrorCode error, const std::string& details); // Notifies the visitor of the close and marks the connection as disconnected. - virtual void CloseConnection(QuicErrorCode error, bool from_peer) OVERRIDE; + virtual void CloseConnection(QuicErrorCode error, bool from_peer) override; virtual void SendGoAway(QuicErrorCode error, QuicStreamId last_good_stream_id, const std::string& reason); @@ -317,7 +317,7 @@ class NET_EXPORT_PRIVATE QuicConnection // QuicBlockedWriterInterface // Called when the underlying connection becomes writable to allow queued // writes to happen. - virtual void OnCanWrite() OVERRIDE; + virtual void OnCanWrite() override; // Called when an error occurs while attempting to write a packet to the // network. @@ -335,47 +335,47 @@ class NET_EXPORT_PRIVATE QuicConnection } // From QuicFramerVisitorInterface - virtual void OnError(QuicFramer* framer) OVERRIDE; - virtual bool OnProtocolVersionMismatch(QuicVersion received_version) OVERRIDE; - virtual void OnPacket() OVERRIDE; + virtual void OnError(QuicFramer* framer) override; + virtual bool OnProtocolVersionMismatch(QuicVersion received_version) override; + virtual void OnPacket() override; virtual void OnPublicResetPacket( - const QuicPublicResetPacket& packet) OVERRIDE; + const QuicPublicResetPacket& packet) override; virtual void OnVersionNegotiationPacket( - const QuicVersionNegotiationPacket& packet) OVERRIDE; - virtual void OnRevivedPacket() OVERRIDE; + const QuicVersionNegotiationPacket& packet) override; + virtual void OnRevivedPacket() override; virtual bool OnUnauthenticatedPublicHeader( - const QuicPacketPublicHeader& header) OVERRIDE; - virtual bool OnUnauthenticatedHeader(const QuicPacketHeader& header) OVERRIDE; - virtual void OnDecryptedPacket(EncryptionLevel level) OVERRIDE; - virtual bool OnPacketHeader(const QuicPacketHeader& header) OVERRIDE; - virtual void OnFecProtectedPayload(base::StringPiece payload) OVERRIDE; - virtual bool OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE; - virtual bool OnAckFrame(const QuicAckFrame& frame) OVERRIDE; + const QuicPacketPublicHeader& header) override; + virtual bool OnUnauthenticatedHeader(const QuicPacketHeader& header) override; + virtual void OnDecryptedPacket(EncryptionLevel level) override; + virtual bool OnPacketHeader(const QuicPacketHeader& header) override; + virtual void OnFecProtectedPayload(base::StringPiece payload) override; + virtual bool OnStreamFrame(const QuicStreamFrame& frame) override; + virtual bool OnAckFrame(const QuicAckFrame& frame) override; virtual bool OnCongestionFeedbackFrame( - const QuicCongestionFeedbackFrame& frame) OVERRIDE; - virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) OVERRIDE; - virtual bool OnPingFrame(const QuicPingFrame& frame) OVERRIDE; - virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE; + const QuicCongestionFeedbackFrame& frame) override; + virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override; + virtual bool OnPingFrame(const QuicPingFrame& frame) override; + virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) override; virtual bool OnConnectionCloseFrame( - const QuicConnectionCloseFrame& frame) OVERRIDE; - virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE; - virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) OVERRIDE; - virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE; - virtual void OnFecData(const QuicFecData& fec) OVERRIDE; - virtual void OnPacketComplete() OVERRIDE; + const QuicConnectionCloseFrame& frame) override; + virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) override; + virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) override; + virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) override; + virtual void OnFecData(const QuicFecData& fec) override; + virtual void OnPacketComplete() override; // QuicPacketGenerator::DelegateInterface virtual bool ShouldGeneratePacket(TransmissionType transmission_type, HasRetransmittableData retransmittable, - IsHandshake handshake) OVERRIDE; - virtual QuicAckFrame* CreateAckFrame() OVERRIDE; - virtual QuicCongestionFeedbackFrame* CreateFeedbackFrame() OVERRIDE; - virtual QuicStopWaitingFrame* CreateStopWaitingFrame() OVERRIDE; - virtual void OnSerializedPacket(const SerializedPacket& packet) OVERRIDE; + IsHandshake handshake) override; + virtual QuicAckFrame* CreateAckFrame() override; + virtual QuicCongestionFeedbackFrame* CreateFeedbackFrame() override; + virtual QuicStopWaitingFrame* CreateStopWaitingFrame() override; + virtual void OnSerializedPacket(const SerializedPacket& packet) override; // QuicSentPacketManager::NetworkChangeVisitor virtual void OnCongestionWindowChange( - QuicByteCount congestion_window) OVERRIDE; + QuicByteCount congestion_window) override; // Called by the crypto stream when the handshake completes. In the server's // case this is when the SHLO has been ACKed. Clients call this on receipt of diff --git a/net/quic/quic_connection_helper.cc b/net/quic/quic_connection_helper.cc index fefd6fa..83c1648 100644 --- a/net/quic/quic_connection_helper.cc +++ b/net/quic/quic_connection_helper.cc @@ -29,7 +29,7 @@ class QuicChromeAlarm : public QuicAlarm { weak_factory_(this) {} protected: - virtual void SetImpl() OVERRIDE { + virtual void SetImpl() override { DCHECK(deadline().IsInitialized()); if (task_deadline_.IsInitialized()) { if (task_deadline_ <= deadline()) { @@ -54,7 +54,7 @@ class QuicChromeAlarm : public QuicAlarm { task_deadline_ = deadline(); } - virtual void CancelImpl() OVERRIDE { + virtual void CancelImpl() override { DCHECK(!deadline().IsInitialized()); // Since tasks can not be un-posted, OnAlarm will be invoked which // will notice that deadline is not Initialized and will do nothing. diff --git a/net/quic/quic_connection_helper.h b/net/quic/quic_connection_helper.h index 28cff52..e1754e5 100644 --- a/net/quic/quic_connection_helper.h +++ b/net/quic/quic_connection_helper.h @@ -37,9 +37,9 @@ class NET_EXPORT_PRIVATE QuicConnectionHelper virtual ~QuicConnectionHelper(); // QuicConnectionHelperInterface - virtual const QuicClock* GetClock() const OVERRIDE; - virtual QuicRandom* GetRandomGenerator() OVERRIDE; - virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) OVERRIDE; + virtual const QuicClock* GetClock() const override; + virtual QuicRandom* GetRandomGenerator() override; + virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) override; private: base::TaskRunner* task_runner_; diff --git a/net/quic/quic_connection_helper_test.cc b/net/quic/quic_connection_helper_test.cc index 638ca46..8a2c931 100644 --- a/net/quic/quic_connection_helper_test.cc +++ b/net/quic/quic_connection_helper_test.cc @@ -17,7 +17,7 @@ class TestDelegate : public QuicAlarm::Delegate { public: TestDelegate() : fired_(false) {} - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { fired_ = true; return QuicTime::Zero(); } diff --git a/net/quic/quic_connection_logger.h b/net/quic/quic_connection_logger.h index 7693d79..3f30ebb 100644 --- a/net/quic/quic_connection_logger.h +++ b/net/quic/quic_connection_logger.h @@ -31,7 +31,7 @@ class NET_EXPORT_PRIVATE QuicConnectionLogger virtual ~QuicConnectionLogger(); // QuicPacketGenerator::DebugDelegateInterface - virtual void OnFrameAddedToPacket(const QuicFrame& frame) OVERRIDE; + virtual void OnFrameAddedToPacket(const QuicFrame& frame) override; // QuicConnectionDebugVisitorInterface virtual void OnPacketSent(QuicPacketSequenceNumber sequence_number, @@ -39,38 +39,38 @@ class NET_EXPORT_PRIVATE QuicConnectionLogger EncryptionLevel level, TransmissionType transmission_type, const QuicEncryptedPacket& packet, - WriteResult result) OVERRIDE; + WriteResult result) override; virtual void OnPacketReceived(const IPEndPoint& self_address, const IPEndPoint& peer_address, - const QuicEncryptedPacket& packet) OVERRIDE; + const QuicEncryptedPacket& packet) override; virtual void OnIncorrectConnectionId( - QuicConnectionId connection_id) OVERRIDE; - virtual void OnUndecryptablePacket() OVERRIDE; + QuicConnectionId connection_id) override; + virtual void OnUndecryptablePacket() override; virtual void OnDuplicatePacket(QuicPacketSequenceNumber sequence_number) - OVERRIDE; - virtual void OnProtocolVersionMismatch(QuicVersion version) OVERRIDE; - virtual void OnPacketHeader(const QuicPacketHeader& header) OVERRIDE; - virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE; - virtual void OnAckFrame(const QuicAckFrame& frame) OVERRIDE; + override; + virtual void OnProtocolVersionMismatch(QuicVersion version) override; + virtual void OnPacketHeader(const QuicPacketHeader& header) override; + virtual void OnStreamFrame(const QuicStreamFrame& frame) override; + virtual void OnAckFrame(const QuicAckFrame& frame) override; virtual void OnCongestionFeedbackFrame( - const QuicCongestionFeedbackFrame& frame) OVERRIDE; - virtual void OnStopWaitingFrame(const QuicStopWaitingFrame& frame) OVERRIDE; - virtual void OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE; + const QuicCongestionFeedbackFrame& frame) override; + virtual void OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override; + virtual void OnRstStreamFrame(const QuicRstStreamFrame& frame) override; virtual void OnConnectionCloseFrame( - const QuicConnectionCloseFrame& frame) OVERRIDE; - virtual void OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) OVERRIDE; - virtual void OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE; - virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE; - virtual void OnPingFrame(const QuicPingFrame& frame) OVERRIDE; + const QuicConnectionCloseFrame& frame) override; + virtual void OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) override; + virtual void OnBlockedFrame(const QuicBlockedFrame& frame) override; + virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) override; + virtual void OnPingFrame(const QuicPingFrame& frame) override; virtual void OnPublicResetPacket( - const QuicPublicResetPacket& packet) OVERRIDE; + const QuicPublicResetPacket& packet) override; virtual void OnVersionNegotiationPacket( - const QuicVersionNegotiationPacket& packet) OVERRIDE; + const QuicVersionNegotiationPacket& packet) override; virtual void OnRevivedPacket(const QuicPacketHeader& revived_header, - base::StringPiece payload) OVERRIDE; - virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE; + base::StringPiece payload) override; + virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) override; virtual void OnSuccessfulVersionNegotiation( - const QuicVersion& version) OVERRIDE; + const QuicVersion& version) override; void OnCryptoHandshakeMessageReceived( const CryptoHandshakeMessage& message); diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc index 2869513..9e29ee1 100644 --- a/net/quic/quic_connection_test.cc +++ b/net/quic/quic_connection_test.cc @@ -93,15 +93,15 @@ class TaggingEncrypter : public QuicEncrypter { virtual ~TaggingEncrypter() {} // QuicEncrypter interface. - virtual bool SetKey(StringPiece key) OVERRIDE { return true; } - virtual bool SetNoncePrefix(StringPiece nonce_prefix) OVERRIDE { + virtual bool SetKey(StringPiece key) override { return true; } + virtual bool SetNoncePrefix(StringPiece nonce_prefix) override { return true; } virtual bool Encrypt(StringPiece nonce, StringPiece associated_data, StringPiece plaintext, - unsigned char* output) OVERRIDE { + unsigned char* output) override { memcpy(output, plaintext.data(), plaintext.size()); output += plaintext.size(); memset(output, tag_, kTagSize); @@ -110,29 +110,29 @@ class TaggingEncrypter : public QuicEncrypter { virtual QuicData* EncryptPacket(QuicPacketSequenceNumber sequence_number, StringPiece associated_data, - StringPiece plaintext) OVERRIDE { + StringPiece plaintext) override { const size_t len = plaintext.size() + kTagSize; uint8* buffer = new uint8[len]; Encrypt(StringPiece(), associated_data, plaintext, buffer); return new QuicData(reinterpret_cast<char*>(buffer), len, true); } - virtual size_t GetKeySize() const OVERRIDE { return 0; } - virtual size_t GetNoncePrefixSize() const OVERRIDE { return 0; } + virtual size_t GetKeySize() const override { return 0; } + virtual size_t GetNoncePrefixSize() const override { return 0; } - virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const OVERRIDE { + virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const override { return ciphertext_size - kTagSize; } - virtual size_t GetCiphertextSize(size_t plaintext_size) const OVERRIDE { + virtual size_t GetCiphertextSize(size_t plaintext_size) const override { return plaintext_size + kTagSize; } - virtual StringPiece GetKey() const OVERRIDE { + virtual StringPiece GetKey() const override { return StringPiece(); } - virtual StringPiece GetNoncePrefix() const OVERRIDE { + virtual StringPiece GetNoncePrefix() const override { return StringPiece(); } @@ -153,8 +153,8 @@ class TaggingDecrypter : public QuicDecrypter { virtual ~TaggingDecrypter() {} // QuicDecrypter interface - virtual bool SetKey(StringPiece key) OVERRIDE { return true; } - virtual bool SetNoncePrefix(StringPiece nonce_prefix) OVERRIDE { + virtual bool SetKey(StringPiece key) override { return true; } + virtual bool SetNoncePrefix(StringPiece nonce_prefix) override { return true; } @@ -162,7 +162,7 @@ class TaggingDecrypter : public QuicDecrypter { StringPiece associated_data, StringPiece ciphertext, unsigned char* output, - size_t* output_length) OVERRIDE { + size_t* output_length) override { if (ciphertext.size() < kTagSize) { return false; } @@ -176,7 +176,7 @@ class TaggingDecrypter : public QuicDecrypter { virtual QuicData* DecryptPacket(QuicPacketSequenceNumber sequence_number, StringPiece associated_data, - StringPiece ciphertext) OVERRIDE { + StringPiece ciphertext) override { if (ciphertext.size() < kTagSize) { return nullptr; } @@ -190,8 +190,8 @@ class TaggingDecrypter : public QuicDecrypter { true /* owns buffer */); } - virtual StringPiece GetKey() const OVERRIDE { return StringPiece(); } - virtual StringPiece GetNoncePrefix() const OVERRIDE { return StringPiece(); } + virtual StringPiece GetKey() const override { return StringPiece(); } + virtual StringPiece GetNoncePrefix() const override { return StringPiece(); } protected: virtual uint8 GetTag(StringPiece ciphertext) { @@ -222,7 +222,7 @@ class StrictTaggingDecrypter : public TaggingDecrypter { virtual ~StrictTaggingDecrypter() {} // TaggingQuicDecrypter - virtual uint8 GetTag(StringPiece ciphertext) OVERRIDE { + virtual uint8 GetTag(StringPiece ciphertext) override { return tag_; } @@ -238,8 +238,8 @@ class TestConnectionHelper : public QuicConnectionHelperInterface { : QuicAlarm(delegate) { } - virtual void SetImpl() OVERRIDE {} - virtual void CancelImpl() OVERRIDE {} + virtual void SetImpl() override {} + virtual void CancelImpl() override {} using QuicAlarm::Fire; }; @@ -250,15 +250,15 @@ class TestConnectionHelper : public QuicConnectionHelperInterface { } // QuicConnectionHelperInterface - virtual const QuicClock* GetClock() const OVERRIDE { + virtual const QuicClock* GetClock() const override { return clock_; } - virtual QuicRandom* GetRandomGenerator() OVERRIDE { + virtual QuicRandom* GetRandomGenerator() override { return random_generator_; } - virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) OVERRIDE { + virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) override { return new TestAlarm(delegate); } @@ -288,7 +288,7 @@ class TestPacketWriter : public QuicPacketWriter { virtual WriteResult WritePacket( const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE { + const IPEndPoint& peer_address) override { QuicEncryptedPacket packet(buffer, buf_len); ++packets_write_attempts_; @@ -313,13 +313,13 @@ class TestPacketWriter : public QuicPacketWriter { return WriteResult(WRITE_STATUS_OK, last_packet_size_); } - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE { + virtual bool IsWriteBlockedDataBuffered() const override { return is_write_blocked_data_buffered_; } - virtual bool IsWriteBlocked() const OVERRIDE { return write_blocked_; } + virtual bool IsWriteBlocked() const override { return write_blocked_; } - virtual void SetWritable() OVERRIDE { write_blocked_ = false; } + virtual void SetWritable() override { write_blocked_ = false; } void BlockOnNextWrite() { block_on_next_write_ = true; } @@ -591,7 +591,7 @@ class FecQuicConnectionDebugVisitor : public QuicConnectionDebugVisitor { public: virtual void OnRevivedPacket(const QuicPacketHeader& header, - StringPiece data) OVERRIDE { + StringPiece data) override { revived_header_ = header; } diff --git a/net/quic/quic_crypto_client_stream.h b/net/quic/quic_crypto_client_stream.h index 96d2556..801c3da 100644 --- a/net/quic/quic_crypto_client_stream.h +++ b/net/quic/quic_crypto_client_stream.h @@ -33,7 +33,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream { // CryptoFramerVisitorInterface implementation virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE; + const CryptoHandshakeMessage& message) override; // Performs a crypto handshake with the server. Returns true if the crypto // handshake is started successfully. @@ -62,7 +62,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream { virtual ~ChannelIDSourceCallbackImpl(); // ChannelIDSourceCallback interface. - virtual void Run(scoped_ptr<ChannelIDKey>* channel_id_key) OVERRIDE; + virtual void Run(scoped_ptr<ChannelIDKey>* channel_id_key) override; // Cancel causes any future callbacks to be ignored. It must be called on // the same thread as the callback will be made on. @@ -83,7 +83,7 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream { // ProofVerifierCallback interface. virtual void Run(bool ok, const string& error_details, - scoped_ptr<ProofVerifyDetails>* details) OVERRIDE; + scoped_ptr<ProofVerifyDetails>* details) override; // Cancel causes any future callbacks to be ignored. It must be called on // the same thread as the callback will be made on. diff --git a/net/quic/quic_crypto_server_stream.h b/net/quic/quic_crypto_server_stream.h index 46ac4f3..611f8d9 100644 --- a/net/quic/quic_crypto_server_stream.h +++ b/net/quic/quic_crypto_server_stream.h @@ -38,7 +38,7 @@ class NET_EXPORT_PRIVATE ServerHelloNotifier : public int num_original_bytes, int num_retransmitted_packets, int num_retransmitted_bytes, - QuicTime::Delta delta_largest_observed) OVERRIDE; + QuicTime::Delta delta_largest_observed) override; private: virtual ~ServerHelloNotifier() {} @@ -60,7 +60,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream { // CryptoFramerVisitorInterface implementation virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE; + const CryptoHandshakeMessage& message) override; // GetBase64SHA256ClientChannelID sets |*output| to the base64 encoded, // SHA-256 hash of the client's ChannelID key and returns true, if the client @@ -103,7 +103,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream : public QuicCryptoStream { // From ValidateClientHelloResultCallback virtual void RunImpl(const CryptoHandshakeMessage& client_hello, - const Result& result) OVERRIDE; + const Result& result) override; private: QuicCryptoServerStream* parent_; diff --git a/net/quic/quic_crypto_stream.h b/net/quic/quic_crypto_stream.h index dc8b227..6698e3e 100644 --- a/net/quic/quic_crypto_stream.h +++ b/net/quic/quic_crypto_stream.h @@ -34,13 +34,13 @@ class NET_EXPORT_PRIVATE QuicCryptoStream explicit QuicCryptoStream(QuicSession* session); // CryptoFramerVisitorInterface implementation - virtual void OnError(CryptoFramer* framer) OVERRIDE; + virtual void OnError(CryptoFramer* framer) override; virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE; + const CryptoHandshakeMessage& message) override; // ReliableQuicStream implementation - virtual uint32 ProcessRawData(const char* data, uint32 data_len) OVERRIDE; - virtual QuicPriority EffectivePriority() const OVERRIDE; + virtual uint32 ProcessRawData(const char* data, uint32 data_len) override; + virtual QuicPriority EffectivePriority() const override; // Sends |message| to the peer. // TODO(wtc): return a success/failure status. diff --git a/net/quic/quic_crypto_stream_test.cc b/net/quic/quic_crypto_stream_test.cc index 4ea8f49..e79a1f3 100644 --- a/net/quic/quic_crypto_stream_test.cc +++ b/net/quic/quic_crypto_stream_test.cc @@ -30,7 +30,7 @@ class MockQuicCryptoStream : public QuicCryptoStream { } virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE { + const CryptoHandshakeMessage& message) override { messages_.push_back(message); } diff --git a/net/quic/quic_data_stream.h b/net/quic/quic_data_stream.h index 1af9004..7cb9816 100644 --- a/net/quic/quic_data_stream.h +++ b/net/quic/quic_data_stream.h @@ -57,13 +57,13 @@ class NET_EXPORT_PRIVATE QuicDataStream : public ReliableQuicStream { virtual ~QuicDataStream(); // ReliableQuicStream implementation - virtual void OnClose() OVERRIDE; - virtual uint32 ProcessRawData(const char* data, uint32 data_len) OVERRIDE; + virtual void OnClose() override; + virtual uint32 ProcessRawData(const char* data, uint32 data_len) override; // By default, this is the same as priority(), however it allows streams // to temporarily alter effective priority. For example if a SPDY stream has // compressed but not written headers it can write the headers with a higher // priority. - virtual QuicPriority EffectivePriority() const OVERRIDE; + virtual QuicPriority EffectivePriority() const override; // Overridden by subclasses to process data. The headers will be delivered // via OnStreamHeaders, so only data will be delivered through this method. diff --git a/net/quic/quic_data_stream_test.cc b/net/quic/quic_data_stream_test.cc index 279dcd3..2f6d84e 100644 --- a/net/quic/quic_data_stream_test.cc +++ b/net/quic/quic_data_stream_test.cc @@ -40,7 +40,7 @@ class TestStream : public QuicDataStream { : QuicDataStream(id, session), should_process_data_(should_process_data) {} - virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE { + virtual uint32 ProcessData(const char* data, uint32 data_len) override { EXPECT_NE(0u, data_len); DVLOG(1) << "ProcessData data_len: " << data_len; data_ += string(data, data_len); diff --git a/net/quic/quic_default_packet_writer.h b/net/quic/quic_default_packet_writer.h index 15eb0dd..329f7cc 100644 --- a/net/quic/quic_default_packet_writer.h +++ b/net/quic/quic_default_packet_writer.h @@ -29,10 +29,10 @@ class NET_EXPORT_PRIVATE QuicDefaultPacketWriter : public QuicPacketWriter { virtual WriteResult WritePacket(const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE; - virtual bool IsWriteBlocked() const OVERRIDE; - virtual void SetWritable() OVERRIDE; + const IPEndPoint& peer_address) override; + virtual bool IsWriteBlockedDataBuffered() const override; + virtual bool IsWriteBlocked() const override; + virtual void SetWritable() override; void OnWriteComplete(int rv); void SetConnection(QuicConnection* connection) { diff --git a/net/quic/quic_dispatcher.cc b/net/quic/quic_dispatcher.cc index a72faa6..121e32f 100644 --- a/net/quic/quic_dispatcher.cc +++ b/net/quic/quic_dispatcher.cc @@ -28,7 +28,7 @@ class DeleteSessionsAlarm : public QuicAlarm::Delegate { : dispatcher_(dispatcher) { } - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { dispatcher_->DeleteSessions(); return QuicTime::Zero(); } @@ -44,23 +44,23 @@ class QuicDispatcher::QuicFramerVisitor : public QuicFramerVisitorInterface { connection_id_(0) {} // QuicFramerVisitorInterface implementation - virtual void OnPacket() OVERRIDE {} + virtual void OnPacket() override {} virtual bool OnUnauthenticatedPublicHeader( - const QuicPacketPublicHeader& header) OVERRIDE { + const QuicPacketPublicHeader& header) override { connection_id_ = header.connection_id; return dispatcher_->OnUnauthenticatedPublicHeader(header); } virtual bool OnUnauthenticatedHeader( - const QuicPacketHeader& header) OVERRIDE { + const QuicPacketHeader& header) override { dispatcher_->OnUnauthenticatedHeader(header); return false; } - virtual void OnError(QuicFramer* framer) OVERRIDE { + virtual void OnError(QuicFramer* framer) override { DVLOG(1) << QuicUtils::ErrorToString(framer->error()); } virtual bool OnProtocolVersionMismatch( - QuicVersion /*received_version*/) OVERRIDE { + QuicVersion /*received_version*/) override { if (dispatcher_->time_wait_list_manager()->IsConnectionIdInTimeWait( connection_id_)) { // Keep processing after protocol mismatch - this will be dealt with by @@ -77,74 +77,74 @@ class QuicDispatcher::QuicFramerVisitor : public QuicFramerVisitorInterface { // false from OnUnauthenticatedHeader(). As a result, we never process the // payload of the packet. virtual void OnPublicResetPacket( - const QuicPublicResetPacket& /*packet*/) OVERRIDE { + const QuicPublicResetPacket& /*packet*/) override { DCHECK(false); } virtual void OnVersionNegotiationPacket( - const QuicVersionNegotiationPacket& /*packet*/) OVERRIDE { + const QuicVersionNegotiationPacket& /*packet*/) override { DCHECK(false); } - virtual void OnDecryptedPacket(EncryptionLevel level) OVERRIDE { + virtual void OnDecryptedPacket(EncryptionLevel level) override { DCHECK(false); } - virtual bool OnPacketHeader(const QuicPacketHeader& /*header*/) OVERRIDE { + virtual bool OnPacketHeader(const QuicPacketHeader& /*header*/) override { DCHECK(false); return false; } - virtual void OnRevivedPacket() OVERRIDE { + virtual void OnRevivedPacket() override { DCHECK(false); } - virtual void OnFecProtectedPayload(StringPiece /*payload*/) OVERRIDE { + virtual void OnFecProtectedPayload(StringPiece /*payload*/) override { DCHECK(false); } - virtual bool OnStreamFrame(const QuicStreamFrame& /*frame*/) OVERRIDE { + virtual bool OnStreamFrame(const QuicStreamFrame& /*frame*/) override { DCHECK(false); return false; } - virtual bool OnAckFrame(const QuicAckFrame& /*frame*/) OVERRIDE { + virtual bool OnAckFrame(const QuicAckFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnCongestionFeedbackFrame( - const QuicCongestionFeedbackFrame& /*frame*/) OVERRIDE { + const QuicCongestionFeedbackFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnStopWaitingFrame( - const QuicStopWaitingFrame& /*frame*/) OVERRIDE { + const QuicStopWaitingFrame& /*frame*/) override { DCHECK(false); return false; } - virtual bool OnPingFrame(const QuicPingFrame& /*frame*/) OVERRIDE { + virtual bool OnPingFrame(const QuicPingFrame& /*frame*/) override { DCHECK(false); return false; } - virtual bool OnRstStreamFrame(const QuicRstStreamFrame& /*frame*/) OVERRIDE { + virtual bool OnRstStreamFrame(const QuicRstStreamFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnConnectionCloseFrame( - const QuicConnectionCloseFrame & /*frame*/) OVERRIDE { + const QuicConnectionCloseFrame & /*frame*/) override { DCHECK(false); return false; } - virtual bool OnGoAwayFrame(const QuicGoAwayFrame& /*frame*/) OVERRIDE { + virtual bool OnGoAwayFrame(const QuicGoAwayFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& /*frame*/) - OVERRIDE { + override { DCHECK(false); return false; } - virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE { + virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) override { DCHECK(false); return false; } - virtual void OnFecData(const QuicFecData& /*fec*/) OVERRIDE { + virtual void OnFecData(const QuicFecData& /*fec*/) override { DCHECK(false); } - virtual void OnPacketComplete() OVERRIDE { + virtual void OnPacketComplete() override { DCHECK(false); } diff --git a/net/quic/quic_dispatcher.h b/net/quic/quic_dispatcher.h index d07c46c..b4be0ee 100644 --- a/net/quic/quic_dispatcher.h +++ b/net/quic/quic_dispatcher.h @@ -64,7 +64,7 @@ class QuicDispatcher : public QuicBlockedWriterInterface, virtual QuicPacketWriter* Create( QuicServerPacketWriter* writer, - QuicConnection* connection) OVERRIDE; + QuicConnection* connection) override; }; // Ideally we'd have a linked_hash_set: the boolean is unused. @@ -89,7 +89,7 @@ class QuicDispatcher : public QuicBlockedWriterInterface, // an existing session, or passing it to the TimeWaitListManager. virtual void ProcessPacket(const IPEndPoint& server_address, const IPEndPoint& client_address, - const QuicEncryptedPacket& packet) OVERRIDE; + const QuicEncryptedPacket& packet) override; // Returns true if there's anything in the blocked writer list. virtual bool HasPendingWrites() const; @@ -99,16 +99,16 @@ class QuicDispatcher : public QuicBlockedWriterInterface, // QuicBlockedWriterInterface implementation: // Called when the socket becomes writable to allow queued writes to happen. - virtual void OnCanWrite() OVERRIDE; + virtual void OnCanWrite() override; // QuicServerSessionVisitor interface implementation: // Ensure that the closed connection is cleaned up asynchronously. virtual void OnConnectionClosed(QuicConnectionId connection_id, - QuicErrorCode error) OVERRIDE; + QuicErrorCode error) override; // Queues the blocked writer for later resumption. virtual void OnWriteBlocked( - QuicBlockedWriterInterface* blocked_writer) OVERRIDE; + QuicBlockedWriterInterface* blocked_writer) override; typedef base::hash_map<QuicConnectionId, QuicSession*> SessionMap; @@ -185,7 +185,7 @@ class QuicDispatcher : public QuicBlockedWriterInterface, PacketWriterFactoryAdapter(QuicDispatcher* dispatcher); virtual ~PacketWriterFactoryAdapter (); - virtual QuicPacketWriter* Create(QuicConnection* connection) const OVERRIDE; + virtual QuicPacketWriter* Create(QuicConnection* connection) const override; private: QuicDispatcher* dispatcher_; diff --git a/net/quic/quic_end_to_end_unittest.cc b/net/quic/quic_end_to_end_unittest.cc index a37bd19..016b324 100644 --- a/net/quic/quic_end_to_end_unittest.cc +++ b/net/quic/quic_end_to_end_unittest.cc @@ -53,16 +53,16 @@ class TestTransactionFactory : public HttpTransactionFactory { // HttpTransactionFactory methods virtual int CreateTransaction(RequestPriority priority, - scoped_ptr<HttpTransaction>* trans) OVERRIDE { + scoped_ptr<HttpTransaction>* trans) override { trans->reset(new HttpNetworkTransaction(priority, session_.get())); return OK; } - virtual HttpCache* GetCache() OVERRIDE { + virtual HttpCache* GetCache() override { return nullptr; } - virtual HttpNetworkSession* GetSession() OVERRIDE { return session_.get(); }; + virtual HttpNetworkSession* GetSession() override { return session_.get(); }; private: scoped_refptr<HttpNetworkSession> session_; diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc index 535d31a..9ba0fd6 100644 --- a/net/quic/quic_framer_test.cc +++ b/net/quic/quic_framer_test.cc @@ -104,43 +104,43 @@ const size_t kPublicResetPacketMessageTagOffset = class TestEncrypter : public QuicEncrypter { public: virtual ~TestEncrypter() {} - virtual bool SetKey(StringPiece key) OVERRIDE { + virtual bool SetKey(StringPiece key) override { return true; } - virtual bool SetNoncePrefix(StringPiece nonce_prefix) OVERRIDE { + virtual bool SetNoncePrefix(StringPiece nonce_prefix) override { return true; } virtual bool Encrypt(StringPiece nonce, StringPiece associated_data, StringPiece plaintext, - unsigned char* output) OVERRIDE { + unsigned char* output) override { CHECK(false) << "Not implemented"; return false; } virtual QuicData* EncryptPacket(QuicPacketSequenceNumber sequence_number, StringPiece associated_data, - StringPiece plaintext) OVERRIDE { + StringPiece plaintext) override { sequence_number_ = sequence_number; associated_data_ = associated_data.as_string(); plaintext_ = plaintext.as_string(); return new QuicData(plaintext.data(), plaintext.length()); } - virtual size_t GetKeySize() const OVERRIDE { + virtual size_t GetKeySize() const override { return 0; } - virtual size_t GetNoncePrefixSize() const OVERRIDE { + virtual size_t GetNoncePrefixSize() const override { return 0; } - virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const OVERRIDE { + virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const override { return ciphertext_size; } - virtual size_t GetCiphertextSize(size_t plaintext_size) const OVERRIDE { + virtual size_t GetCiphertextSize(size_t plaintext_size) const override { return plaintext_size; } - virtual StringPiece GetKey() const OVERRIDE { + virtual StringPiece GetKey() const override { return StringPiece(); } - virtual StringPiece GetNoncePrefix() const OVERRIDE { + virtual StringPiece GetNoncePrefix() const override { return StringPiece(); } QuicPacketSequenceNumber sequence_number_; @@ -151,32 +151,32 @@ class TestEncrypter : public QuicEncrypter { class TestDecrypter : public QuicDecrypter { public: virtual ~TestDecrypter() {} - virtual bool SetKey(StringPiece key) OVERRIDE { + virtual bool SetKey(StringPiece key) override { return true; } - virtual bool SetNoncePrefix(StringPiece nonce_prefix) OVERRIDE { + virtual bool SetNoncePrefix(StringPiece nonce_prefix) override { return true; } virtual bool Decrypt(StringPiece nonce, StringPiece associated_data, StringPiece ciphertext, unsigned char* output, - size_t* output_length) OVERRIDE { + size_t* output_length) override { CHECK(false) << "Not implemented"; return false; } virtual QuicData* DecryptPacket(QuicPacketSequenceNumber sequence_number, StringPiece associated_data, - StringPiece ciphertext) OVERRIDE { + StringPiece ciphertext) override { sequence_number_ = sequence_number; associated_data_ = associated_data.as_string(); ciphertext_ = ciphertext.as_string(); return new QuicData(ciphertext.data(), ciphertext.length()); } - virtual StringPiece GetKey() const OVERRIDE { + virtual StringPiece GetKey() const override { return StringPiece(); } - virtual StringPiece GetNoncePrefix() const OVERRIDE { + virtual StringPiece GetNoncePrefix() const override { return StringPiece(); } QuicPacketSequenceNumber sequence_number_; @@ -207,121 +207,121 @@ class TestQuicVisitor : public ::net::QuicFramerVisitorInterface { STLDeleteElements(&fec_data_); } - virtual void OnError(QuicFramer* f) OVERRIDE { + virtual void OnError(QuicFramer* f) override { DVLOG(1) << "QuicFramer Error: " << QuicUtils::ErrorToString(f->error()) << " (" << f->error() << ")"; ++error_count_; } - virtual void OnPacket() OVERRIDE {} + virtual void OnPacket() override {} virtual void OnPublicResetPacket( - const QuicPublicResetPacket& packet) OVERRIDE { + const QuicPublicResetPacket& packet) override { public_reset_packet_.reset(new QuicPublicResetPacket(packet)); } virtual void OnVersionNegotiationPacket( - const QuicVersionNegotiationPacket& packet) OVERRIDE { + const QuicVersionNegotiationPacket& packet) override { version_negotiation_packet_.reset(new QuicVersionNegotiationPacket(packet)); } - virtual void OnRevivedPacket() OVERRIDE { + virtual void OnRevivedPacket() override { ++revived_packets_; } - virtual bool OnProtocolVersionMismatch(QuicVersion version) OVERRIDE { + virtual bool OnProtocolVersionMismatch(QuicVersion version) override { DVLOG(1) << "QuicFramer Version Mismatch, version: " << version; ++version_mismatch_; return true; } virtual bool OnUnauthenticatedPublicHeader( - const QuicPacketPublicHeader& header) OVERRIDE { + const QuicPacketPublicHeader& header) override { public_header_.reset(new QuicPacketPublicHeader(header)); return accept_public_header_; } virtual bool OnUnauthenticatedHeader( - const QuicPacketHeader& header) OVERRIDE { + const QuicPacketHeader& header) override { return true; } - virtual void OnDecryptedPacket(EncryptionLevel level) OVERRIDE {} + virtual void OnDecryptedPacket(EncryptionLevel level) override {} - virtual bool OnPacketHeader(const QuicPacketHeader& header) OVERRIDE { + virtual bool OnPacketHeader(const QuicPacketHeader& header) override { ++packet_count_; header_.reset(new QuicPacketHeader(header)); return accept_packet_; } - virtual bool OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE { + virtual bool OnStreamFrame(const QuicStreamFrame& frame) override { ++frame_count_; stream_frames_.push_back(new QuicStreamFrame(frame)); return true; } - virtual void OnFecProtectedPayload(StringPiece payload) OVERRIDE { + virtual void OnFecProtectedPayload(StringPiece payload) override { fec_protected_payload_ = payload.as_string(); } - virtual bool OnAckFrame(const QuicAckFrame& frame) OVERRIDE { + virtual bool OnAckFrame(const QuicAckFrame& frame) override { ++frame_count_; ack_frames_.push_back(new QuicAckFrame(frame)); return true; } virtual bool OnCongestionFeedbackFrame( - const QuicCongestionFeedbackFrame& frame) OVERRIDE { + const QuicCongestionFeedbackFrame& frame) override { ++frame_count_; congestion_feedback_frames_.push_back( new QuicCongestionFeedbackFrame(frame)); return true; } - virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) OVERRIDE { + virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override { ++frame_count_; stop_waiting_frames_.push_back(new QuicStopWaitingFrame(frame)); return true; } - virtual bool OnPingFrame(const QuicPingFrame& frame) OVERRIDE { + virtual bool OnPingFrame(const QuicPingFrame& frame) override { ++frame_count_; ping_frames_.push_back(new QuicPingFrame(frame)); return true; } - virtual void OnFecData(const QuicFecData& fec) OVERRIDE { + virtual void OnFecData(const QuicFecData& fec) override { ++fec_count_; fec_data_.push_back(new QuicFecData(fec)); } - virtual void OnPacketComplete() OVERRIDE { + virtual void OnPacketComplete() override { ++complete_packets_; } - virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE { + virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) override { rst_stream_frame_ = frame; return true; } virtual bool OnConnectionCloseFrame( - const QuicConnectionCloseFrame& frame) OVERRIDE { + const QuicConnectionCloseFrame& frame) override { connection_close_frame_ = frame; return true; } - virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE { + virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) override { goaway_frame_ = frame; return true; } virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) - OVERRIDE { + override { window_update_frame_ = frame; return true; } - virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE { + virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) override { blocked_frame_ = frame; return true; } diff --git a/net/quic/quic_headers_stream.cc b/net/quic/quic_headers_stream.cc index 35dac3fe..56b700e 100644 --- a/net/quic/quic_headers_stream.cc +++ b/net/quic/quic_headers_stream.cc @@ -30,7 +30,7 @@ class QuicHeadersStream::SpdyFramerVisitor SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, - bool unidirectional) OVERRIDE { + bool unidirectional) override { if (!stream_->IsConnected()) { return; } @@ -48,7 +48,7 @@ class QuicHeadersStream::SpdyFramerVisitor stream_->OnSynStream(stream_id, priority, fin); } - virtual void OnSynReply(SpdyStreamId stream_id, bool fin) OVERRIDE { + virtual void OnSynReply(SpdyStreamId stream_id, bool fin) override { if (!stream_->IsConnected()) { return; } @@ -58,7 +58,7 @@ class QuicHeadersStream::SpdyFramerVisitor virtual bool OnControlFrameHeaderData(SpdyStreamId stream_id, const char* header_data, - size_t len) OVERRIDE { + size_t len) override { if (!stream_->IsConnected()) { return false; } @@ -69,7 +69,7 @@ class QuicHeadersStream::SpdyFramerVisitor virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE { + bool fin) override { if (fin && len == 0) { // The framer invokes OnStreamFrameData with zero-length data and // fin = true after processing a SYN_STREAM or SYN_REPLY frame @@ -79,65 +79,65 @@ class QuicHeadersStream::SpdyFramerVisitor CloseConnection("SPDY DATA frame received."); } - virtual void OnError(SpdyFramer* framer) OVERRIDE { + virtual void OnError(SpdyFramer* framer) override { CloseConnection("SPDY framing error."); } virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE { + bool fin) override { CloseConnection("SPDY DATA frame received."); } virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE { + SpdyRstStreamStatus status) override { CloseConnection("SPDY RST_STREAM frame received."); } virtual void OnSetting(SpdySettingsIds id, uint8 flags, - uint32 value) OVERRIDE { + uint32 value) override { CloseConnection("SPDY SETTINGS frame received."); } - virtual void OnSettingsAck() OVERRIDE { + virtual void OnSettingsAck() override { CloseConnection("SPDY SETTINGS frame received."); } - virtual void OnSettingsEnd() OVERRIDE { + virtual void OnSettingsEnd() override { CloseConnection("SPDY SETTINGS frame received."); } - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE { + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override { CloseConnection("SPDY PING frame received."); } virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE { + SpdyGoAwayStatus status) override { CloseConnection("SPDY GOAWAY frame received."); } - virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) OVERRIDE { + virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) override { CloseConnection("SPDY HEADERS frame received."); } virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE { + uint32 delta_window_size) override { CloseConnection("SPDY WINDOW_UPDATE frame received."); } virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - bool end) OVERRIDE { + bool end) override { LOG(DFATAL) << "PUSH_PROMISE frame received from a SPDY/3 framer"; CloseConnection("SPDY PUSH_PROMISE frame received."); } - virtual void OnContinuation(SpdyStreamId stream_id, bool end) OVERRIDE { + virtual void OnContinuation(SpdyStreamId stream_id, bool end) override { CloseConnection("SPDY CONTINUATION frame received."); } - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE { + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override { CloseConnection("SPDY unknown frame received."); return false; } @@ -146,11 +146,11 @@ class QuicHeadersStream::SpdyFramerVisitor virtual void OnSendCompressedFrame(SpdyStreamId stream_id, SpdyFrameType type, size_t payload_len, - size_t frame_len) OVERRIDE {} + size_t frame_len) override {} virtual void OnReceiveCompressedFrame(SpdyStreamId stream_id, SpdyFrameType type, - size_t frame_len) OVERRIDE { + size_t frame_len) override { if (stream_->IsConnected()) { stream_->OnCompressedFrameSize(frame_len); } diff --git a/net/quic/quic_headers_stream.h b/net/quic/quic_headers_stream.h index c3ccbda..fb96ec7 100644 --- a/net/quic/quic_headers_stream.h +++ b/net/quic/quic_headers_stream.h @@ -34,8 +34,8 @@ class NET_EXPORT_PRIVATE QuicHeadersStream : public ReliableQuicStream { QuicAckNotifier::DelegateInterface* ack_notifier_delegate); // ReliableQuicStream implementation - virtual uint32 ProcessRawData(const char* data, uint32 data_len) OVERRIDE; - virtual QuicPriority EffectivePriority() const OVERRIDE; + virtual uint32 ProcessRawData(const char* data, uint32 data_len) override; + virtual QuicPriority EffectivePriority() const override; private: class SpdyFramerVisitor; diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h index 5c60822..44e98e8 100644 --- a/net/quic/quic_http_stream.h +++ b/net/quic/quic_http_stream.h @@ -35,41 +35,41 @@ class NET_EXPORT_PRIVATE QuicHttpStream : virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE; - virtual UploadProgress GetUploadProgress() const OVERRIDE; - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual UploadProgress GetUploadProgress() const override; + virtual int ReadResponseHeaders(const CompletionCallback& callback) override; virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void Close(bool not_reusable) OVERRIDE; - virtual HttpStream* RenewStreamForAuth() OVERRIDE; - virtual bool IsResponseBodyComplete() const OVERRIDE; - virtual bool CanFindEndOfResponse() const OVERRIDE; - virtual bool IsConnectionReused() const OVERRIDE; - virtual void SetConnectionReused() OVERRIDE; - virtual bool IsConnectionReusable() const OVERRIDE; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Close(bool not_reusable) override; + virtual HttpStream* RenewStreamForAuth() override; + virtual bool IsResponseBodyComplete() const override; + virtual bool CanFindEndOfResponse() const override; + virtual bool IsConnectionReused() const override; + virtual void SetConnectionReused() override; + virtual bool IsConnectionReusable() const override; + virtual int64 GetTotalReceivedBytes() const override; virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual void GetSSLInfo(SSLInfo* ssl_info) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual bool IsSpdyHttpStream() const OVERRIDE; - virtual void Drain(HttpNetworkSession* session) OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual bool IsSpdyHttpStream() const override; + virtual void Drain(HttpNetworkSession* session) override; + virtual void SetPriority(RequestPriority priority) override; // QuicReliableClientStream::Delegate implementation - virtual int OnDataReceived(const char* data, int length) OVERRIDE; - virtual void OnClose(QuicErrorCode error) OVERRIDE; - virtual void OnError(int error) OVERRIDE; - virtual bool HasSendHeadersComplete() OVERRIDE; + virtual int OnDataReceived(const char* data, int length) override; + virtual void OnClose(QuicErrorCode error) override; + virtual void OnError(int error) override; + virtual bool HasSendHeadersComplete() override; // QuicClientSession::Observer implementation - virtual void OnCryptoHandshakeConfirmed() OVERRIDE; - virtual void OnSessionClosed(int error) OVERRIDE; + virtual void OnCryptoHandshakeConfirmed() override; + virtual void OnSessionClosed(int error) override; private: friend class test::QuicHttpStreamPeer; diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index 313e7f5..9926477 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc @@ -97,7 +97,7 @@ class AutoClosingStream : public QuicHttpStream { : QuicHttpStream(session) { } - virtual int OnDataReceived(const char* data, int length) OVERRIDE { + virtual int OnDataReceived(const char* data, int length) override { Close(false); return OK; } @@ -109,7 +109,7 @@ class TestPacketWriterFactory : public QuicConnection::PacketWriterFactory { : socket_(socket) {} virtual ~TestPacketWriterFactory() {} - virtual QuicPacketWriter* Create(QuicConnection* connection) const OVERRIDE { + virtual QuicPacketWriter* Create(QuicConnection* connection) const override { return new QuicDefaultPacketWriter(socket_); } diff --git a/net/quic/quic_packet_creator.h b/net/quic/quic_packet_creator.h index 313632e..cb4cb05 100644 --- a/net/quic/quic_packet_creator.h +++ b/net/quic/quic_packet_creator.h @@ -38,7 +38,7 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface { // QuicFecBuilderInterface virtual void OnBuiltFecProtectedPayload(const QuicPacketHeader& header, - base::StringPiece payload) OVERRIDE; + base::StringPiece payload) override; // Turn on FEC protection for subsequently created packets. FEC should be // enabled first (max_packets_per_fec_group should be non-zero) for FEC diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc index c8d5686..0872762 100644 --- a/net/quic/quic_packet_creator_test.cc +++ b/net/quic/quic_packet_creator_test.cc @@ -75,7 +75,7 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> { server_framer_.set_visitor(&framer_visitor_); } - virtual ~QuicPacketCreatorTest() OVERRIDE { + virtual ~QuicPacketCreatorTest() override { } void ProcessPacket(QuicPacket* packet) { diff --git a/net/quic/quic_packet_generator_test.cc b/net/quic/quic_packet_generator_test.cc index 703fd64..190e8a7 100644 --- a/net/quic/quic_packet_generator_test.cc +++ b/net/quic/quic_packet_generator_test.cc @@ -33,7 +33,7 @@ namespace { class MockDelegate : public QuicPacketGenerator::DelegateInterface { public: MockDelegate() {} - virtual ~MockDelegate() OVERRIDE {} + virtual ~MockDelegate() override {} MOCK_METHOD3(ShouldGeneratePacket, bool(TransmissionType transmission_type, @@ -116,7 +116,7 @@ class QuicPacketGeneratorTest : public ::testing::Test { packet6_(0, PACKET_1BYTE_SEQUENCE_NUMBER, nullptr, 0, nullptr), packet7_(0, PACKET_1BYTE_SEQUENCE_NUMBER, nullptr, 0, nullptr) {} - virtual ~QuicPacketGeneratorTest() OVERRIDE { + virtual ~QuicPacketGeneratorTest() override { delete packet_.packet; delete packet_.retransmittable_frames; delete packet2_.packet; diff --git a/net/quic/quic_per_connection_packet_writer.h b/net/quic/quic_per_connection_packet_writer.h index 9b9b912..4e5e8c8 100644 --- a/net/quic/quic_per_connection_packet_writer.h +++ b/net/quic/quic_per_connection_packet_writer.h @@ -32,10 +32,10 @@ class QuicPerConnectionPacketWriter : public QuicPacketWriter { virtual WriteResult WritePacket(const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE; - virtual bool IsWriteBlocked() const OVERRIDE; - virtual void SetWritable() OVERRIDE; + const IPEndPoint& peer_address) override; + virtual bool IsWriteBlockedDataBuffered() const override; + virtual bool IsWriteBlocked() const override; + virtual void SetWritable() override; private: void OnWriteComplete(WriteResult result); diff --git a/net/quic/quic_received_packet_manager.h b/net/quic/quic_received_packet_manager.h index 1231891..9eccfe0 100644 --- a/net/quic/quic_received_packet_manager.h +++ b/net/quic/quic_received_packet_manager.h @@ -129,7 +129,7 @@ class NET_EXPORT_PRIVATE QuicReceivedPacketManager : // Called by QuicFramer, when the outgoing ack gets truncated, to recalculate // the received entropy hash for the truncated ack frame. virtual QuicPacketEntropyHash EntropyHash( - QuicPacketSequenceNumber sequence_number) const OVERRIDE; + QuicPacketSequenceNumber sequence_number) const override; // Updates internal state based on |stop_waiting|. void UpdatePacketInformationSentByPeer( diff --git a/net/quic/quic_reliable_client_stream.h b/net/quic/quic_reliable_client_stream.h index 2d5b818..065db9e 100644 --- a/net/quic/quic_reliable_client_stream.h +++ b/net/quic/quic_reliable_client_stream.h @@ -54,10 +54,10 @@ class NET_EXPORT_PRIVATE QuicReliableClientStream : public QuicDataStream { virtual ~QuicReliableClientStream(); // QuicDataStream - virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE; - virtual void OnFinRead() OVERRIDE; - virtual void OnCanWrite() OVERRIDE; - virtual QuicPriority EffectivePriority() const OVERRIDE; + virtual uint32 ProcessData(const char* data, uint32 data_len) override; + virtual void OnFinRead() override; + virtual void OnCanWrite() override; + virtual QuicPriority EffectivePriority() const override; // While the server's set_priority shouldn't be called externally, the creator // of client-side streams should be able to set the priority. diff --git a/net/quic/quic_sent_packet_manager_test.cc b/net/quic/quic_sent_packet_manager_test.cc index 42c9a6f..3260ab1 100644 --- a/net/quic/quic_sent_packet_manager_test.cc +++ b/net/quic/quic_sent_packet_manager_test.cc @@ -63,7 +63,7 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> { EXPECT_CALL(*send_algorithm_, InRecovery()).Times(AnyNumber()); } - virtual ~QuicSentPacketManagerTest() OVERRIDE { + virtual ~QuicSentPacketManagerTest() override { STLDeleteElements(&packets_); } diff --git a/net/quic/quic_server_packet_writer.h b/net/quic/quic_server_packet_writer.h index 417ea8d..15c946b3 100644 --- a/net/quic/quic_server_packet_writer.h +++ b/net/quic/quic_server_packet_writer.h @@ -41,16 +41,16 @@ class QuicServerPacketWriter : public QuicPacketWriter { void OnWriteComplete(int rv); // QuicPacketWriter implementation: - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE; - virtual bool IsWriteBlocked() const OVERRIDE; - virtual void SetWritable() OVERRIDE; + virtual bool IsWriteBlockedDataBuffered() const override; + virtual bool IsWriteBlocked() const override; + virtual void SetWritable() override; protected: // Do not call WritePacket on its own -- use WritePacketWithCallback virtual WriteResult WritePacket(const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; + const IPEndPoint& peer_address) override; private: UDPServerSocket* socket_; diff --git a/net/quic/quic_server_session.h b/net/quic/quic_server_session.h index a2e4feb..80b6443 100644 --- a/net/quic/quic_server_session.h +++ b/net/quic/quic_server_session.h @@ -49,12 +49,12 @@ class QuicServerSession : public QuicSession { QuicServerSessionVisitor* visitor); // Override the base class to notify the owner of the connection close. - virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE; - virtual void OnWriteBlocked() OVERRIDE; + virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) override; + virtual void OnWriteBlocked() override; // Sends a server config update to the client, containing new bandwidth // estimate. - virtual void OnCongestionWindowChange(QuicTime now) OVERRIDE; + virtual void OnCongestionWindowChange(QuicTime now) override; virtual ~QuicServerSession(); @@ -65,7 +65,7 @@ class QuicServerSession : public QuicSession { } // Override base class to process FEC config received from client. - virtual void OnConfigNegotiated() OVERRIDE; + virtual void OnConfigNegotiated() override; void set_serving_region(string serving_region) { serving_region_ = serving_region; @@ -73,9 +73,9 @@ class QuicServerSession : public QuicSession { protected: // QuicSession methods: - virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE; - virtual QuicDataStream* CreateOutgoingDataStream() OVERRIDE; - virtual QuicCryptoServerStream* GetCryptoStream() OVERRIDE; + virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) override; + virtual QuicDataStream* CreateOutgoingDataStream() override; + virtual QuicCryptoServerStream* GetCryptoStream() override; // If we should create an incoming stream, returns true. Otherwise // does error handling, including communicating the error to the client and diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc index cef5656..080200f 100644 --- a/net/quic/quic_session.cc +++ b/net/quic/quic_session.cc @@ -34,65 +34,65 @@ class VisitorShim : public QuicConnectionVisitorInterface { public: explicit VisitorShim(QuicSession* session) : session_(session) {} - virtual void OnStreamFrames(const vector<QuicStreamFrame>& frames) OVERRIDE { + virtual void OnStreamFrames(const vector<QuicStreamFrame>& frames) override { session_->OnStreamFrames(frames); session_->PostProcessAfterData(); } - virtual void OnRstStream(const QuicRstStreamFrame& frame) OVERRIDE { + virtual void OnRstStream(const QuicRstStreamFrame& frame) override { session_->OnRstStream(frame); session_->PostProcessAfterData(); } - virtual void OnGoAway(const QuicGoAwayFrame& frame) OVERRIDE { + virtual void OnGoAway(const QuicGoAwayFrame& frame) override { session_->OnGoAway(frame); session_->PostProcessAfterData(); } virtual void OnWindowUpdateFrames(const vector<QuicWindowUpdateFrame>& frames) - OVERRIDE { + override { session_->OnWindowUpdateFrames(frames); session_->PostProcessAfterData(); } virtual void OnBlockedFrames(const vector<QuicBlockedFrame>& frames) - OVERRIDE { + override { session_->OnBlockedFrames(frames); session_->PostProcessAfterData(); } - virtual void OnCanWrite() OVERRIDE { + virtual void OnCanWrite() override { session_->OnCanWrite(); session_->PostProcessAfterData(); } - virtual void OnCongestionWindowChange(QuicTime now) OVERRIDE { + virtual void OnCongestionWindowChange(QuicTime now) override { session_->OnCongestionWindowChange(now); } virtual void OnSuccessfulVersionNegotiation( - const QuicVersion& version) OVERRIDE { + const QuicVersion& version) override { session_->OnSuccessfulVersionNegotiation(version); } virtual void OnConnectionClosed( - QuicErrorCode error, bool from_peer) OVERRIDE { + QuicErrorCode error, bool from_peer) override { session_->OnConnectionClosed(error, from_peer); // The session will go away, so don't bother with cleanup. } - virtual void OnWriteBlocked() OVERRIDE { + virtual void OnWriteBlocked() override { session_->OnWriteBlocked(); } - virtual bool WillingAndAbleToWrite() const OVERRIDE { + virtual bool WillingAndAbleToWrite() const override { return session_->WillingAndAbleToWrite(); } - virtual bool HasPendingHandshake() const OVERRIDE { + virtual bool HasPendingHandshake() const override { return session_->HasPendingHandshake(); } - virtual bool HasOpenDataStreams() const OVERRIDE { + virtual bool HasOpenDataStreams() const override { return session_->HasOpenDataStreams(); } diff --git a/net/quic/quic_session.h b/net/quic/quic_session.h index 7a52fba..165a2d9 100644 --- a/net/quic/quic_session.h +++ b/net/quic/quic_session.h @@ -59,22 +59,22 @@ class NET_EXPORT_PRIVATE QuicSession : public QuicConnectionVisitorInterface { // QuicConnectionVisitorInterface methods: virtual void OnStreamFrames( - const std::vector<QuicStreamFrame>& frames) OVERRIDE; - virtual void OnRstStream(const QuicRstStreamFrame& frame) OVERRIDE; - virtual void OnGoAway(const QuicGoAwayFrame& frame) OVERRIDE; + const std::vector<QuicStreamFrame>& frames) override; + virtual void OnRstStream(const QuicRstStreamFrame& frame) override; + virtual void OnGoAway(const QuicGoAwayFrame& frame) override; virtual void OnWindowUpdateFrames( - const std::vector<QuicWindowUpdateFrame>& frames) OVERRIDE; + const std::vector<QuicWindowUpdateFrame>& frames) override; virtual void OnBlockedFrames( - const std::vector<QuicBlockedFrame>& frames) OVERRIDE; - virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE; - virtual void OnWriteBlocked() OVERRIDE {} + const std::vector<QuicBlockedFrame>& frames) override; + virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) override; + virtual void OnWriteBlocked() override {} virtual void OnSuccessfulVersionNegotiation( - const QuicVersion& version) OVERRIDE; - virtual void OnCanWrite() OVERRIDE; - virtual void OnCongestionWindowChange(QuicTime now) OVERRIDE {} - virtual bool WillingAndAbleToWrite() const OVERRIDE; - virtual bool HasPendingHandshake() const OVERRIDE; - virtual bool HasOpenDataStreams() const OVERRIDE; + const QuicVersion& version) override; + virtual void OnCanWrite() override; + virtual void OnCongestionWindowChange(QuicTime now) override {} + virtual bool WillingAndAbleToWrite() const override; + virtual bool HasPendingHandshake() const override; + virtual bool HasOpenDataStreams() const override; // Called by the headers stream when headers have been received for a stream. virtual void OnStreamHeaders(QuicStreamId stream_id, diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc index a36b77c..a22a909 100644 --- a/net/quic/quic_session_test.cc +++ b/net/quic/quic_session_test.cc @@ -52,7 +52,7 @@ class TestCryptoStream : public QuicCryptoStream { } virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE { + const CryptoHandshakeMessage& message) override { encryption_established_ = true; handshake_confirmed_ = true; CryptoHandshakeMessage msg; @@ -91,7 +91,7 @@ class TestStream : public QuicDataStream { using ReliableQuicStream::CloseWriteSide; - virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE { + virtual uint32 ProcessData(const char* data, uint32 data_len) override { return data_len; } @@ -129,17 +129,17 @@ class TestSession : public QuicSession { InitializeSession(); } - virtual TestCryptoStream* GetCryptoStream() OVERRIDE { + virtual TestCryptoStream* GetCryptoStream() override { return &crypto_stream_; } - virtual TestStream* CreateOutgoingDataStream() OVERRIDE { + virtual TestStream* CreateOutgoingDataStream() override { TestStream* stream = new TestStream(GetNextStreamId(), this); ActivateStream(stream); return stream; } - virtual TestStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE { + virtual TestStream* CreateIncomingDataStream(QuicStreamId id) override { return new TestStream(id, this); } @@ -157,7 +157,7 @@ class TestSession : public QuicSession { QuicStreamOffset offset, bool fin, FecProtection fec_protection, - QuicAckNotifier::DelegateInterface* ack_notifier_delegate) OVERRIDE { + QuicAckNotifier::DelegateInterface* ack_notifier_delegate) override { // Always consumes everything. if (writev_consumes_all_data_) { return QuicConsumedData(data.TotalBufferSize(), fin); diff --git a/net/quic/quic_spdy_server_stream.h b/net/quic/quic_spdy_server_stream.h index 3cecb6b..afd1291 100644 --- a/net/quic/quic_spdy_server_stream.h +++ b/net/quic/quic_spdy_server_stream.h @@ -31,8 +31,8 @@ class QuicSpdyServerStream : public QuicDataStream { // ReliableQuicStream implementation called by the session when there's // data for us. - virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE; - virtual void OnFinRead() OVERRIDE; + virtual uint32 ProcessData(const char* data, uint32 data_len) override; + virtual void OnFinRead() override; void ParseRequestHeaders(); diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index ccbca64..39be0eb 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -104,7 +104,7 @@ class DefaultPacketWriterFactory : public QuicConnection::PacketWriterFactory { : socket_(socket) {} virtual ~DefaultPacketWriterFactory() {} - virtual QuicPacketWriter* Create(QuicConnection* connection) const OVERRIDE; + virtual QuicPacketWriter* Create(QuicConnection* connection) const override; private: DatagramClientSocket* socket_; diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h index f4aa77e7..f962699 100644 --- a/net/quic/quic_stream_factory.h +++ b/net/quic/quic_stream_factory.h @@ -147,13 +147,13 @@ class NET_EXPORT_PRIVATE QuicStreamFactory // Until the servers support roaming, close all connections when the local // IP address changes. - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; // CertDatabase::Observer methods: // We close all sessions when certificate database is changed. - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE; - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE; + virtual void OnCertAdded(const X509Certificate* cert) override; + virtual void OnCACertChanged(const X509Certificate* cert) override; bool require_confirmation() const { return require_confirmation_; diff --git a/net/quic/quic_stream_sequencer_test.cc b/net/quic/quic_stream_sequencer_test.cc index c553fe5..8c90c9f 100644 --- a/net/quic/quic_stream_sequencer_test.cc +++ b/net/quic/quic_stream_sequencer_test.cc @@ -44,7 +44,7 @@ class MockStream : public ReliableQuicStream { const string& details)); MOCK_METHOD1(Reset, void(QuicRstStreamErrorCode error)); MOCK_METHOD0(OnCanWrite, void()); - virtual QuicPriority EffectivePriority() const OVERRIDE { + virtual QuicPriority EffectivePriority() const override { return QuicUtils::HighestPriority(); } virtual bool IsFlowControlEnabled() const { diff --git a/net/quic/quic_time_wait_list_manager.cc b/net/quic/quic_time_wait_list_manager.cc index d1f3419..4e069d5 100644 --- a/net/quic/quic_time_wait_list_manager.cc +++ b/net/quic/quic_time_wait_list_manager.cc @@ -41,7 +41,7 @@ class ConnectionIdCleanUpAlarm : public QuicAlarm::Delegate { QuicTimeWaitListManager* time_wait_list_manager) : time_wait_list_manager_(time_wait_list_manager) {} - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { time_wait_list_manager_->CleanUpOldConnectionIds(); // Let the time wait manager register the alarm at appropriate time. return QuicTime::Zero(); diff --git a/net/quic/quic_time_wait_list_manager.h b/net/quic/quic_time_wait_list_manager.h index 4d7b0c5..13544b7 100644 --- a/net/quic/quic_time_wait_list_manager.h +++ b/net/quic/quic_time_wait_list_manager.h @@ -79,7 +79,7 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface { // Called by the dispatcher when the underlying socket becomes writable again, // since we might need to send pending public reset packets which we didn't // send because the underlying socket was write blocked. - virtual void OnCanWrite() OVERRIDE; + virtual void OnCanWrite() override; // Used to delete connection_id entries that have outlived their time wait // period. diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc index a10b0ab..1575518 100644 --- a/net/quic/reliable_quic_stream.cc +++ b/net/quic/reliable_quic_stream.cc @@ -81,7 +81,7 @@ class ReliableQuicStream::ProxyAckNotifierDelegate int num_retransmitted_packets, int num_retransmitted_bytes, QuicTime::Delta delta_largest_observed) - OVERRIDE { + override { DCHECK_LT(0, pending_acks_); --pending_acks_; num_original_packets_ += num_original_packets; @@ -106,7 +106,7 @@ class ReliableQuicStream::ProxyAckNotifierDelegate protected: // Delegates are ref counted. - virtual ~ProxyAckNotifierDelegate() OVERRIDE { + virtual ~ProxyAckNotifierDelegate() override { } private: diff --git a/net/quic/reliable_quic_stream_test.cc b/net/quic/reliable_quic_stream_test.cc index 336ea53..713d0e3 100644 --- a/net/quic/reliable_quic_stream_test.cc +++ b/net/quic/reliable_quic_stream_test.cc @@ -48,14 +48,14 @@ class TestStream : public ReliableQuicStream { : ReliableQuicStream(id, session), should_process_data_(should_process_data) {} - virtual uint32 ProcessRawData(const char* data, uint32 data_len) OVERRIDE { + virtual uint32 ProcessRawData(const char* data, uint32 data_len) override { EXPECT_NE(0u, data_len); DVLOG(1) << "ProcessData data_len: " << data_len; data_ += string(data, data_len); return should_process_data_ ? data_len : 0; } - virtual QuicPriority EffectivePriority() const OVERRIDE { + virtual QuicPriority EffectivePriority() const override { return QuicUtils::HighestPriority(); } diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc index cf8df9a..fe7e872 100644 --- a/net/quic/test_tools/crypto_test_utils.cc +++ b/net/quic/test_tools/crypto_test_utils.cc @@ -41,10 +41,10 @@ class CryptoFramerVisitor : public CryptoFramerVisitorInterface { : error_(false) { } - virtual void OnError(CryptoFramer* framer) OVERRIDE { error_ = true; } + virtual void OnError(CryptoFramer* framer) override { error_ = true; } virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE { + const CryptoHandshakeMessage& message) override { messages_.push_back(message); } @@ -143,7 +143,7 @@ class AsyncTestChannelIDSource : public ChannelIDSource, virtual QuicAsyncStatus GetChannelIDKey( const string& hostname, scoped_ptr<ChannelIDKey>* channel_id_key, - ChannelIDSourceCallback* callback) OVERRIDE { + ChannelIDSourceCallback* callback) override { // Synchronous mode. if (!callback) { return sync_source_->GetChannelIDKey(hostname, channel_id_key, nullptr); @@ -160,7 +160,7 @@ class AsyncTestChannelIDSource : public ChannelIDSource, } // CallbackSource implementation. - virtual void RunPendingCallbacks() OVERRIDE { + virtual void RunPendingCallbacks() override { if (callback_.get()) { callback_->Run(&channel_id_key_); callback_.reset(); @@ -356,12 +356,12 @@ class MockCommonCertSets : public CommonCertSets { index_(index) { } - virtual StringPiece GetCommonHashes() const OVERRIDE { + virtual StringPiece GetCommonHashes() const override { CHECK(false) << "not implemented"; return StringPiece(); } - virtual StringPiece GetCert(uint64 hash, uint32 index) const OVERRIDE { + virtual StringPiece GetCert(uint64 hash, uint32 index) const override { if (hash == hash_ && index == index_) { return cert_; } @@ -371,7 +371,7 @@ class MockCommonCertSets : public CommonCertSets { virtual bool MatchCert(StringPiece cert, StringPiece common_set_hashes, uint64* out_hash, - uint32* out_index) const OVERRIDE { + uint32* out_index) const override { if (cert != cert_) { return false; } diff --git a/net/quic/test_tools/crypto_test_utils_chromium.cc b/net/quic/test_tools/crypto_test_utils_chromium.cc index e475e56..d5edc6c 100644 --- a/net/quic/test_tools/crypto_test_utils_chromium.cc +++ b/net/quic/test_tools/crypto_test_utils_chromium.cc @@ -59,7 +59,7 @@ class FakeProofSource : public ProofSource { const std::string& server_config, bool ecdsa_ok, const std::vector<std::string>** out_certs, - std::string* out_signature) OVERRIDE { + std::string* out_signature) override { *out_certs = &certs_; *out_signature = kSignature; return true; @@ -84,7 +84,7 @@ class FakeProofVerifier : public ProofVerifier { const ProofVerifyContext* verify_context, std::string* error_details, scoped_ptr<ProofVerifyDetails>* verify_details, - ProofVerifierCallback* callback) OVERRIDE { + ProofVerifierCallback* callback) override { error_details->clear(); scoped_ptr<ProofVerifyDetailsChromium> verify_details_chromium( new ProofVerifyDetailsChromium); diff --git a/net/quic/test_tools/crypto_test_utils_nss.cc b/net/quic/test_tools/crypto_test_utils_nss.cc index eaf0ecd..96fdd31 100644 --- a/net/quic/test_tools/crypto_test_utils_nss.cc +++ b/net/quic/test_tools/crypto_test_utils_nss.cc @@ -29,7 +29,7 @@ class TestChannelIDSource : public ChannelIDSource { virtual QuicAsyncStatus GetChannelIDKey( const string& hostname, scoped_ptr<ChannelIDKey>* channel_id_key, - ChannelIDSourceCallback* /*callback*/) OVERRIDE { + ChannelIDSourceCallback* /*callback*/) override { channel_id_key->reset(new ChannelIDKeyChromium(HostnameToKey(hostname))); return QUIC_SUCCESS; } diff --git a/net/quic/test_tools/crypto_test_utils_openssl.cc b/net/quic/test_tools/crypto_test_utils_openssl.cc index 15babd4..4db57b5 100644 --- a/net/quic/test_tools/crypto_test_utils_openssl.cc +++ b/net/quic/test_tools/crypto_test_utils_openssl.cc @@ -26,12 +26,12 @@ namespace test { class TestChannelIDKey : public ChannelIDKey { public: explicit TestChannelIDKey(EVP_PKEY* ecdsa_key) : ecdsa_key_(ecdsa_key) {} - virtual ~TestChannelIDKey() OVERRIDE {} + virtual ~TestChannelIDKey() override {} // ChannelIDKey implementation. virtual bool Sign(StringPiece signed_data, - string* out_signature) const OVERRIDE { + string* out_signature) const override { crypto::ScopedEVP_MD_CTX md_ctx(EVP_MD_CTX_create()); if (!md_ctx || EVP_DigestSignInit(md_ctx.get(), nullptr, EVP_sha256(), nullptr, @@ -75,7 +75,7 @@ class TestChannelIDKey : public ChannelIDKey { return true; } - virtual string SerializeKey() const OVERRIDE { + virtual string SerializeKey() const override { // i2d_PublicKey will produce an ANSI X9.62 public key which, for a P-256 // key, is 0x04 (meaning uncompressed) followed by the x and y field // elements as 32-byte, big-endian numbers. @@ -106,7 +106,7 @@ class TestChannelIDSource : public ChannelIDSource { virtual QuicAsyncStatus GetChannelIDKey( const string& hostname, scoped_ptr<ChannelIDKey>* channel_id_key, - ChannelIDSourceCallback* /*callback*/) OVERRIDE { + ChannelIDSourceCallback* /*callback*/) override { channel_id_key->reset(new TestChannelIDKey(HostnameToKey(hostname))); return QUIC_SUCCESS; } diff --git a/net/quic/test_tools/delayed_verify_strike_register_client.h b/net/quic/test_tools/delayed_verify_strike_register_client.h index 6ae7ba1..479647b 100644 --- a/net/quic/test_tools/delayed_verify_strike_register_client.h +++ b/net/quic/test_tools/delayed_verify_strike_register_client.h @@ -27,7 +27,7 @@ class DelayedVerifyStrikeRegisterClient : public LocalStrikeRegisterClient { virtual void VerifyNonceIsValidAndUnique(base::StringPiece nonce, QuicWallTime now, - ResultCallback* cb) OVERRIDE; + ResultCallback* cb) override; // Start queueing verifications instead of executing them immediately. void StartDelayingVerification() { diff --git a/net/quic/test_tools/mock_clock.h b/net/quic/test_tools/mock_clock.h index d6e490f..4a2a28c 100644 --- a/net/quic/test_tools/mock_clock.h +++ b/net/quic/test_tools/mock_clock.h @@ -20,11 +20,11 @@ class MockClock : public QuicClock { void AdvanceTime(QuicTime::Delta delta); - virtual QuicTime Now() const OVERRIDE; + virtual QuicTime Now() const override; - virtual QuicTime ApproximateNow() const OVERRIDE; + virtual QuicTime ApproximateNow() const override; - virtual QuicWallTime WallNow() const OVERRIDE; + virtual QuicWallTime WallNow() const override; base::TimeTicks NowInTicks() const; diff --git a/net/quic/test_tools/mock_crypto_client_stream.h b/net/quic/test_tools/mock_crypto_client_stream.h index e940a1e..10803e8 100644 --- a/net/quic/test_tools/mock_crypto_client_stream.h +++ b/net/quic/test_tools/mock_crypto_client_stream.h @@ -46,10 +46,10 @@ class MockCryptoClientStream : public QuicCryptoClientStream { // CryptoFramerVisitorInterface implementation. virtual void OnHandshakeMessage( - const CryptoHandshakeMessage& message) OVERRIDE; + const CryptoHandshakeMessage& message) override; // QuicCryptoClientStream implementation. - virtual bool CryptoConnect() OVERRIDE; + virtual bool CryptoConnect() override; // Invokes the sessions's CryptoHandshakeEvent method with the specified // event. diff --git a/net/quic/test_tools/mock_crypto_client_stream_factory.h b/net/quic/test_tools/mock_crypto_client_stream_factory.h index 721ec25..5add188 100644 --- a/net/quic/test_tools/mock_crypto_client_stream_factory.h +++ b/net/quic/test_tools/mock_crypto_client_stream_factory.h @@ -23,7 +23,7 @@ class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory { virtual QuicCryptoClientStream* CreateQuicCryptoClientStream( const QuicServerId& server_id, QuicClientSession* session, - QuicCryptoClientConfig* crypto_config) OVERRIDE; + QuicCryptoClientConfig* crypto_config) override; void set_handshake_mode( MockCryptoClientStream::HandshakeMode handshake_mode) { diff --git a/net/quic/test_tools/mock_random.h b/net/quic/test_tools/mock_random.h index 53b24b7..b04f170 100644 --- a/net/quic/test_tools/mock_random.h +++ b/net/quic/test_tools/mock_random.h @@ -18,12 +18,12 @@ class MockRandom : public QuicRandom { // QuicRandom: // Fills the |data| buffer with a repeating byte, initially 'r'. - virtual void RandBytes(void* data, size_t len) OVERRIDE; + virtual void RandBytes(void* data, size_t len) override; // Returns base + the current increment. - virtual uint64 RandUint64() OVERRIDE; + virtual uint64 RandUint64() override; // Does nothing. virtual void Reseed(const void* additional_entropy, - size_t entropy_len) OVERRIDE; + size_t entropy_len) override; // ChangeValue increments |increment_|. This causes the value returned by // |RandUint64| and the byte that |RandBytes| fills with, to change. diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc index 0cf13e1..f033bff 100644 --- a/net/quic/test_tools/quic_test_utils.cc +++ b/net/quic/test_tools/quic_test_utils.cc @@ -37,8 +37,8 @@ class TestAlarm : public QuicAlarm { : QuicAlarm(delegate) { } - virtual void SetImpl() OVERRIDE {} - virtual void CancelImpl() OVERRIDE {} + virtual void SetImpl() override {} + virtual void CancelImpl() override {} }; } // namespace @@ -229,7 +229,7 @@ class NiceMockPacketWriterFactory virtual ~NiceMockPacketWriterFactory() {} virtual QuicPacketWriter* Create( - QuicConnection* /*connection*/) const OVERRIDE { + QuicConnection* /*connection*/) const override { return new testing::NiceMock<MockPacketWriter>(); } diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h index 4c57a9b..f009641 100644 --- a/net/quic/test_tools/quic_test_utils.h +++ b/net/quic/test_tools/quic_test_utils.h @@ -190,35 +190,35 @@ class NoOpFramerVisitor : public QuicFramerVisitorInterface { public: NoOpFramerVisitor() {} - virtual void OnError(QuicFramer* framer) OVERRIDE {} - virtual void OnPacket() OVERRIDE {} + virtual void OnError(QuicFramer* framer) override {} + virtual void OnPacket() override {} virtual void OnPublicResetPacket( - const QuicPublicResetPacket& packet) OVERRIDE {} + const QuicPublicResetPacket& packet) override {} virtual void OnVersionNegotiationPacket( - const QuicVersionNegotiationPacket& packet) OVERRIDE {} - virtual void OnRevivedPacket() OVERRIDE {} - virtual bool OnProtocolVersionMismatch(QuicVersion version) OVERRIDE; - virtual bool OnUnauthenticatedHeader(const QuicPacketHeader& header) OVERRIDE; + const QuicVersionNegotiationPacket& packet) override {} + virtual void OnRevivedPacket() override {} + virtual bool OnProtocolVersionMismatch(QuicVersion version) override; + virtual bool OnUnauthenticatedHeader(const QuicPacketHeader& header) override; virtual bool OnUnauthenticatedPublicHeader( - const QuicPacketPublicHeader& header) OVERRIDE; - virtual void OnDecryptedPacket(EncryptionLevel level) OVERRIDE {} - virtual bool OnPacketHeader(const QuicPacketHeader& header) OVERRIDE; - virtual void OnFecProtectedPayload(base::StringPiece payload) OVERRIDE {} - virtual bool OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE; - virtual bool OnAckFrame(const QuicAckFrame& frame) OVERRIDE; + const QuicPacketPublicHeader& header) override; + virtual void OnDecryptedPacket(EncryptionLevel level) override {} + virtual bool OnPacketHeader(const QuicPacketHeader& header) override; + virtual void OnFecProtectedPayload(base::StringPiece payload) override {} + virtual bool OnStreamFrame(const QuicStreamFrame& frame) override; + virtual bool OnAckFrame(const QuicAckFrame& frame) override; virtual bool OnCongestionFeedbackFrame( - const QuicCongestionFeedbackFrame& frame) OVERRIDE; + const QuicCongestionFeedbackFrame& frame) override; virtual bool OnStopWaitingFrame( - const QuicStopWaitingFrame& frame) OVERRIDE; - virtual bool OnPingFrame(const QuicPingFrame& frame) OVERRIDE; - virtual void OnFecData(const QuicFecData& fec) OVERRIDE {} - virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE; + const QuicStopWaitingFrame& frame) override; + virtual bool OnPingFrame(const QuicPingFrame& frame) override; + virtual void OnFecData(const QuicFecData& fec) override {} + virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) override; virtual bool OnConnectionCloseFrame( - const QuicConnectionCloseFrame& frame) OVERRIDE; - virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE; - virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) OVERRIDE; - virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE; - virtual void OnPacketComplete() OVERRIDE {} + const QuicConnectionCloseFrame& frame) override; + virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) override; + virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) override; + virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) override; + virtual void OnPacketComplete() override {} private: DISALLOW_COPY_AND_ASSIGN(NoOpFramerVisitor); @@ -255,9 +255,9 @@ class MockHelper : public QuicConnectionHelperInterface { public: MockHelper(); virtual ~MockHelper(); - virtual const QuicClock* GetClock() const OVERRIDE; - virtual QuicRandom* GetRandomGenerator() OVERRIDE; - virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) OVERRIDE; + virtual const QuicClock* GetClock() const override; + virtual QuicRandom* GetRandomGenerator() override; + virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) override; void AdvanceTime(QuicTime::Delta delta); private: @@ -312,7 +312,7 @@ class MockConnection : public QuicConnection { QuicConnection::ProcessUdpPacket(self_address, peer_address, packet); } - virtual bool OnProtocolVersionMismatch(QuicVersion version) OVERRIDE { + virtual bool OnProtocolVersionMismatch(QuicVersion version) override { return false; } @@ -331,7 +331,7 @@ class PacketSavingConnection : public MockConnection { virtual ~PacketSavingConnection(); - virtual void SendOrQueuePacket(QueuedPacket packet) OVERRIDE; + virtual void SendOrQueuePacket(QueuedPacket packet) override; std::vector<QuicPacket*> packets_; std::vector<QuicEncryptedPacket*> encrypted_packets_; @@ -383,7 +383,7 @@ class TestSession : public QuicSession { void SetCryptoStream(QuicCryptoStream* stream); - virtual QuicCryptoStream* GetCryptoStream() OVERRIDE; + virtual QuicCryptoStream* GetCryptoStream() override; private: QuicCryptoStream* crypto_stream_; @@ -408,7 +408,7 @@ class TestClientSession : public QuicClientSessionBase { void SetCryptoStream(QuicCryptoStream* stream); - virtual QuicCryptoStream* GetCryptoStream() OVERRIDE; + virtual QuicCryptoStream* GetCryptoStream() override; private: QuicCryptoStream* crypto_stream_; @@ -496,7 +496,7 @@ class TestEntropyCalculator : virtual ~TestEntropyCalculator(); virtual QuicPacketEntropyHash EntropyHash( - QuicPacketSequenceNumber sequence_number) const OVERRIDE; + QuicPacketSequenceNumber sequence_number) const override; private: DISALLOW_COPY_AND_ASSIGN(TestEntropyCalculator); @@ -554,7 +554,7 @@ class TestWriterFactory : public QuicDispatcher::PacketWriterFactory { virtual ~TestWriterFactory(); virtual QuicPacketWriter* Create(QuicServerPacketWriter* writer, - QuicConnection* connection) OVERRIDE; + QuicConnection* connection) override; // Calls OnPacketSent on the last QuicConnection to write through one of the // packet writers created by this factory. @@ -572,7 +572,7 @@ class TestWriterFactory : public QuicDispatcher::PacketWriterFactory { const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; + const IPEndPoint& peer_address) override; private: TestWriterFactory* factory_; diff --git a/net/quic/test_tools/simple_quic_framer.cc b/net/quic/test_tools/simple_quic_framer.cc index a08d555..6999cf5 100644 --- a/net/quic/test_tools/simple_quic_framer.cc +++ b/net/quic/test_tools/simple_quic_framer.cc @@ -22,48 +22,48 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface { : error_(QUIC_NO_ERROR) { } - virtual ~SimpleFramerVisitor() OVERRIDE { + virtual ~SimpleFramerVisitor() override { STLDeleteElements(&stream_data_); } - virtual void OnError(QuicFramer* framer) OVERRIDE { + virtual void OnError(QuicFramer* framer) override { error_ = framer->error(); } - virtual bool OnProtocolVersionMismatch(QuicVersion version) OVERRIDE { + virtual bool OnProtocolVersionMismatch(QuicVersion version) override { return false; } - virtual void OnPacket() OVERRIDE {} + virtual void OnPacket() override {} virtual void OnPublicResetPacket( - const QuicPublicResetPacket& packet) OVERRIDE { + const QuicPublicResetPacket& packet) override { public_reset_packet_.reset(new QuicPublicResetPacket(packet)); } virtual void OnVersionNegotiationPacket( - const QuicVersionNegotiationPacket& packet) OVERRIDE { + const QuicVersionNegotiationPacket& packet) override { version_negotiation_packet_.reset( new QuicVersionNegotiationPacket(packet)); } - virtual void OnRevivedPacket() OVERRIDE {} + virtual void OnRevivedPacket() override {} virtual bool OnUnauthenticatedPublicHeader( - const QuicPacketPublicHeader& header) OVERRIDE { + const QuicPacketPublicHeader& header) override { return true; } virtual bool OnUnauthenticatedHeader( - const QuicPacketHeader& header) OVERRIDE { + const QuicPacketHeader& header) override { return true; } - virtual void OnDecryptedPacket(EncryptionLevel level) OVERRIDE {} - virtual bool OnPacketHeader(const QuicPacketHeader& header) OVERRIDE { + virtual void OnDecryptedPacket(EncryptionLevel level) override {} + virtual bool OnPacketHeader(const QuicPacketHeader& header) override { has_header_ = true; header_ = header; return true; } - virtual void OnFecProtectedPayload(StringPiece payload) OVERRIDE {} + virtual void OnFecProtectedPayload(StringPiece payload) override {} - virtual bool OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE { + virtual bool OnStreamFrame(const QuicStreamFrame& frame) override { // Save a copy of the data so it is valid after the packet is processed. stream_data_.push_back(frame.GetDataAsString()); QuicStreamFrame stream_frame(frame); @@ -75,61 +75,61 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface { return true; } - virtual bool OnAckFrame(const QuicAckFrame& frame) OVERRIDE { + virtual bool OnAckFrame(const QuicAckFrame& frame) override { ack_frames_.push_back(frame); return true; } virtual bool OnCongestionFeedbackFrame( - const QuicCongestionFeedbackFrame& frame) OVERRIDE { + const QuicCongestionFeedbackFrame& frame) override { feedback_frames_.push_back(frame); return true; } - virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) OVERRIDE { + virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override { stop_waiting_frames_.push_back(frame); return true; } - virtual bool OnPingFrame(const QuicPingFrame& frame) OVERRIDE { + virtual bool OnPingFrame(const QuicPingFrame& frame) override { ping_frames_.push_back(frame); return true; } - virtual void OnFecData(const QuicFecData& fec) OVERRIDE { + virtual void OnFecData(const QuicFecData& fec) override { fec_data_ = fec; fec_redundancy_ = fec_data_.redundancy.as_string(); fec_data_.redundancy = fec_redundancy_; } - virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE { + virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) override { rst_stream_frames_.push_back(frame); return true; } virtual bool OnConnectionCloseFrame( - const QuicConnectionCloseFrame& frame) OVERRIDE { + const QuicConnectionCloseFrame& frame) override { connection_close_frames_.push_back(frame); return true; } - virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE { + virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) override { goaway_frames_.push_back(frame); return true; } virtual bool OnWindowUpdateFrame( - const QuicWindowUpdateFrame& frame) OVERRIDE { + const QuicWindowUpdateFrame& frame) override { window_update_frames_.push_back(frame); return true; } - virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE { + virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) override { blocked_frames_.push_back(frame); return true; } - virtual void OnPacketComplete() OVERRIDE {} + virtual void OnPacketComplete() override {} const QuicPacketHeader& header() const { return header_; } const vector<QuicAckFrame>& ack_frames() const { return ack_frames_; } diff --git a/net/quic/test_tools/test_task_runner.h b/net/quic/test_tools/test_task_runner.h index e25bf2a..ea6793f 100644 --- a/net/quic/test_tools/test_task_runner.h +++ b/net/quic/test_tools/test_task_runner.h @@ -28,8 +28,8 @@ class TestTaskRunner : public base::TaskRunner { // base::TaskRunner implementation. virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; - virtual bool RunsTasksOnCurrentThread() const OVERRIDE; + base::TimeDelta delay) override; + virtual bool RunsTasksOnCurrentThread() const override; const std::vector<PostedTask>& GetPostedTasks() const; diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc index 216cb03..be0e271d 100644 --- a/net/server/http_server_unittest.cc +++ b/net/server/http_server_unittest.cc @@ -181,7 +181,7 @@ class HttpServerTest : public testing::Test, public: HttpServerTest() : quit_after_request_count_(0) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { scoped_ptr<ServerSocket> server_socket( new TCPServerSocket(NULL, net::NetLog::Source())); server_socket->ListenWithAddressAndPort("127.0.0.1", 0, 1); @@ -189,26 +189,26 @@ class HttpServerTest : public testing::Test, ASSERT_EQ(OK, server_->GetLocalAddress(&server_address_)); } - virtual void OnConnect(int connection_id) OVERRIDE {} + virtual void OnConnect(int connection_id) override {} virtual void OnHttpRequest(int connection_id, - const HttpServerRequestInfo& info) OVERRIDE { + const HttpServerRequestInfo& info) override { requests_.push_back(std::make_pair(info, connection_id)); if (requests_.size() == quit_after_request_count_) run_loop_quit_func_.Run(); } virtual void OnWebSocketRequest(int connection_id, - const HttpServerRequestInfo& info) OVERRIDE { + const HttpServerRequestInfo& info) override { NOTREACHED(); } virtual void OnWebSocketMessage(int connection_id, - const std::string& data) OVERRIDE { + const std::string& data) override { NOTREACHED(); } - virtual void OnClose(int connection_id) OVERRIDE {} + virtual void OnClose(int connection_id) override {} bool RunUntilRequestsReceived(size_t count) { quit_after_request_count_ = count; @@ -249,17 +249,17 @@ namespace { class WebSocketTest : public HttpServerTest { virtual void OnHttpRequest(int connection_id, - const HttpServerRequestInfo& info) OVERRIDE { + const HttpServerRequestInfo& info) override { NOTREACHED(); } virtual void OnWebSocketRequest(int connection_id, - const HttpServerRequestInfo& info) OVERRIDE { + const HttpServerRequestInfo& info) override { HttpServerTest::OnHttpRequest(connection_id, info); } virtual void OnWebSocketMessage(int connection_id, - const std::string& data) OVERRIDE { + const std::string& data) override { } }; @@ -409,7 +409,7 @@ TEST_F(HttpServerTest, RequestWithTooLargeBody) { : quit_loop_func_(quit_loop_func) {} virtual ~TestURLFetcherDelegate() {} - virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const URLFetcher* source) override { EXPECT_EQ(HTTP_INTERNAL_SERVER_ERROR, source->GetResponseCode()); quit_loop_func_.Run(); } @@ -473,10 +473,10 @@ class MockStreamSocket : public StreamSocket { read_buf_len_(0) {} // StreamSocket - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return ERR_NOT_IMPLEMENTED; } - virtual void Disconnect() OVERRIDE { + virtual void Disconnect() override { connected_ = false; if (!read_callback_.is_null()) { read_buf_ = NULL; @@ -484,28 +484,28 @@ class MockStreamSocket : public StreamSocket { base::ResetAndReturn(&read_callback_).Run(ERR_CONNECTION_CLOSED); } } - virtual bool IsConnected() const OVERRIDE { return connected_; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return IsConnected(); } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual bool IsConnected() const override { return connected_; } + virtual bool IsConnectedAndIdle() const override { return IsConnected(); } + virtual int GetPeerAddress(IPEndPoint* address) const override { return ERR_NOT_IMPLEMENTED; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { return ERR_NOT_IMPLEMENTED; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { return true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return net_log_; } + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return true; } + virtual bool UsingTCPFastOpen() const override { return false; } + virtual bool WasNpnNegotiated() const override { return false; } + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { if (!connected_) { return ERR_SOCKET_NOT_CONNECTED; } @@ -523,13 +523,13 @@ class MockStreamSocket : public StreamSocket { return read_len; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_NOT_IMPLEMENTED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { + virtual int SetReceiveBufferSize(int32 size) override { return ERR_NOT_IMPLEMENTED; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { + virtual int SetSendBufferSize(int32 size) override { return ERR_NOT_IMPLEMENTED; } @@ -621,7 +621,7 @@ TEST_F(HttpServerTest, MultipleRequestsOnSameConnection) { class CloseOnConnectHttpServerTest : public HttpServerTest { public: - virtual void OnConnect(int connection_id) OVERRIDE { + virtual void OnConnect(int connection_id) override { connection_ids_.push_back(connection_id); server_->Close(connection_id); } diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc index ec0fdac..118cdf8 100644 --- a/net/server/web_socket.cc +++ b/net/server/web_socket.cc @@ -54,7 +54,7 @@ class WebSocketHixie76 : public net::WebSocket { return new WebSocketHixie76(server, connection, request, pos); } - virtual void Accept(const HttpServerRequestInfo& request) OVERRIDE { + virtual void Accept(const HttpServerRequestInfo& request) override { std::string key1 = request.GetHeaderValue("sec-websocket-key1"); std::string key2 = request.GetHeaderValue("sec-websocket-key2"); @@ -86,7 +86,7 @@ class WebSocketHixie76 : public net::WebSocket { std::string(reinterpret_cast<char*>(digest.a), 16)); } - virtual ParseResult Read(std::string* message) OVERRIDE { + virtual ParseResult Read(std::string* message) override { DCHECK(message); HttpConnection::ReadIOBuffer* read_buf = connection_->read_buf(); if (read_buf->StartOfBuffer()[0]) @@ -103,7 +103,7 @@ class WebSocketHixie76 : public net::WebSocket { return FRAME_OK; } - virtual void Send(const std::string& message) OVERRIDE { + virtual void Send(const std::string& message) override { char message_start = 0; char message_end = -1; server_->SendRaw(connection_->id(), std::string(1, message_start)); @@ -199,7 +199,7 @@ class WebSocketHybi17 : public WebSocket { return new WebSocketHybi17(server, connection, request, pos); } - virtual void Accept(const HttpServerRequestInfo& request) OVERRIDE { + virtual void Accept(const HttpServerRequestInfo& request) override { static const char* const kWebSocketGuid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; std::string key = request.GetHeaderValue("sec-websocket-key"); @@ -217,7 +217,7 @@ class WebSocketHybi17 : public WebSocket { encoded_hash.c_str())); } - virtual ParseResult Read(std::string* message) OVERRIDE { + virtual ParseResult Read(std::string* message) override { HttpConnection::ReadIOBuffer* read_buf = connection_->read_buf(); base::StringPiece frame(read_buf->StartOfBuffer(), read_buf->GetSize()); int bytes_consumed = 0; @@ -230,7 +230,7 @@ class WebSocketHybi17 : public WebSocket { return result; } - virtual void Send(const std::string& message) OVERRIDE { + virtual void Send(const std::string& message) override { if (closed_) return; server_->SendRaw(connection_->id(), diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index 9539145..f372aff 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -56,11 +56,11 @@ class DefaultClientSocketFactory : public ClientSocketFactory, CertDatabase::GetInstance()->RemoveObserver(this); } - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE { + virtual void OnCertAdded(const X509Certificate* cert) override { ClearSSLSessionCache(); } - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE { + virtual void OnCACertChanged(const X509Certificate* cert) override { // Per wtc, we actually only need to flush when trust is reduced. // Always flush now because OnCACertChanged does not tell us this. // See comments in ClientSocketPoolManager::OnCACertChanged. @@ -71,7 +71,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, NetLog* net_log, - const NetLog::Source& source) OVERRIDE { + const NetLog::Source& source) override { return scoped_ptr<DatagramClientSocket>( new UDPClientSocket(bind_type, rand_int_cb, net_log, source)); } @@ -79,7 +79,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, NetLog* net_log, - const NetLog::Source& source) OVERRIDE { + const NetLog::Source& source) override { return scoped_ptr<StreamSocket>( new TCPClientSocket(addresses, net_log, source)); } @@ -88,7 +88,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE { + const SSLClientSocketContext& context) override { // nss_thread_task_runner_ may be NULL if g_use_dedicated_nss_thread is // false or if the dedicated NSS thread failed to start. If so, cause NSS // functions to execute on the current task runner. @@ -120,7 +120,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, #endif } - virtual void ClearSSLSessionCache() OVERRIDE { + virtual void ClearSSLSessionCache() override { SSLClientSocket::ClearSessionCache(); } diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 8079cd4..e2fde00 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -327,10 +327,10 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper void EnableConnectBackupJobs(); // ConnectJob::Delegate methods: - virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE; + virtual void OnConnectJobComplete(int result, ConnectJob* job) override; // NetworkChangeNotifier::IPAddressObserver methods: - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; private: friend class base::RefCounted<ClientSocketPoolBaseHelper>; @@ -856,7 +856,7 @@ class ClientSocketPoolBase { virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const internal::ClientSocketPoolBaseHelper::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE { + ConnectJob::Delegate* delegate) const override { const Request& casted_request = static_cast<const Request&>(request); return connect_job_factory_->NewConnectJob( group_name, casted_request, delegate); diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 5a672b4..3cafc89 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc @@ -130,7 +130,7 @@ class MockClientSocket : public StreamSocket { // Socket implementation. virtual int Read( IOBuffer* /* buf */, int len, - const CompletionCallback& /* callback */) OVERRIDE { + const CompletionCallback& /* callback */) override { if (has_unread_data_ && len > 0) { has_unread_data_ = false; was_used_to_convey_data_ = true; @@ -141,50 +141,50 @@ class MockClientSocket : public StreamSocket { virtual int Write( IOBuffer* /* buf */, int len, - const CompletionCallback& /* callback */) OVERRIDE { + const CompletionCallback& /* callback */) override { was_used_to_convey_data_ = true; return len; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { connected_ = true; return OK; } - virtual void Disconnect() OVERRIDE { connected_ = false; } - virtual bool IsConnected() const OVERRIDE { return connected_; } - virtual bool IsConnectedAndIdle() const OVERRIDE { + virtual void Disconnect() override { connected_ = false; } + virtual bool IsConnected() const override { return connected_; } + virtual bool IsConnectedAndIdle() const override { return connected_ && !has_unread_data_; } - virtual int GetPeerAddress(IPEndPoint* /* address */) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* /* address */) const override { return ERR_UNEXPECTED; } - virtual int GetLocalAddress(IPEndPoint* /* address */) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* /* address */) const override { return ERR_UNEXPECTED; } - virtual const BoundNetLog& NetLog() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return was_used_to_convey_data_; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return false; } + virtual bool WasNpnNegotiated() const override { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } @@ -207,7 +207,7 @@ class MockClientSocketFactory : public ClientSocketFactory { DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, NetLog* net_log, - const NetLog::Source& source) OVERRIDE { + const NetLog::Source& source) override { NOTREACHED(); return scoped_ptr<DatagramClientSocket>(); } @@ -215,7 +215,7 @@ class MockClientSocketFactory : public ClientSocketFactory { virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, NetLog* /* net_log */, - const NetLog::Source& /*source*/) OVERRIDE { + const NetLog::Source& /*source*/) override { allocation_count_++; return scoped_ptr<StreamSocket>(); } @@ -224,12 +224,12 @@ class MockClientSocketFactory : public ClientSocketFactory { scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE { + const SSLClientSocketContext& context) override { NOTIMPLEMENTED(); return scoped_ptr<SSLClientSocket>(); } - virtual void ClearSSLSessionCache() OVERRIDE { + virtual void ClearSSLSessionCache() override { NOTIMPLEMENTED(); } @@ -291,9 +291,9 @@ class TestConnectJob : public ConnectJob { // From ConnectJob: - virtual LoadState GetLoadState() const OVERRIDE { return load_state_; } + virtual LoadState GetLoadState() const override { return load_state_; } - virtual void GetAdditionalErrorState(ClientSocketHandle* handle) OVERRIDE { + virtual void GetAdditionalErrorState(ClientSocketHandle* handle) override { if (store_additional_error_state_) { // Set all of the additional error state fields in some way. handle->set_is_ssl_error(true); @@ -306,7 +306,7 @@ class TestConnectJob : public ConnectJob { private: // From ConnectJob: - virtual int ConnectInternal() OVERRIDE { + virtual int ConnectInternal() override { AddressList ignored; client_socket_factory_->CreateTransportClientSocket( ignored, NULL, net::NetLog::Source()); @@ -457,7 +457,7 @@ class TestConnectJobFactory virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const TestClientSocketPoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE { + ConnectJob::Delegate* delegate) const override { EXPECT_TRUE(!job_types_ || !job_types_->empty()); TestConnectJob::JobType job_type = job_type_; if (job_types_ && !job_types_->empty()) { @@ -473,7 +473,7 @@ class TestConnectJobFactory net_log_)); } - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE { + virtual base::TimeDelta ConnectionTimeout() const override { return timeout_duration_; } @@ -510,7 +510,7 @@ class TestClientSocketPool : public ClientSocketPool { net::RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { const scoped_refptr<TestSocketParams>* casted_socket_params = static_cast<const scoped_refptr<TestSocketParams>*>(params); return base_.RequestSocket(group_name, *casted_socket_params, priority, @@ -520,7 +520,7 @@ class TestClientSocketPool : public ClientSocketPool { virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { const scoped_refptr<TestSocketParams>* casted_params = static_cast<const scoped_refptr<TestSocketParams>*>(params); @@ -529,65 +529,65 @@ class TestClientSocketPool : public ClientSocketPool { virtual void CancelRequest( const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE { + ClientSocketHandle* handle) override { base_.CancelRequest(group_name, handle); } virtual void ReleaseSocket( const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE { + int id) override { base_.ReleaseSocket(group_name, socket.Pass(), id); } - virtual void FlushWithError(int error) OVERRIDE { + virtual void FlushWithError(int error) override { base_.FlushWithError(error); } - virtual bool IsStalled() const OVERRIDE { + virtual bool IsStalled() const override { return base_.IsStalled(); } - virtual void CloseIdleSockets() OVERRIDE { + virtual void CloseIdleSockets() override { base_.CloseIdleSockets(); } - virtual int IdleSocketCount() const OVERRIDE { + virtual int IdleSocketCount() const override { return base_.idle_socket_count(); } virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE { + const std::string& group_name) const override { return base_.IdleSocketCountInGroup(group_name); } virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE { + const ClientSocketHandle* handle) const override { return base_.GetLoadState(group_name, handle); } - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE { + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override { base_.AddHigherLayeredPool(higher_pool); } virtual void RemoveHigherLayeredPool( - HigherLayeredPool* higher_pool) OVERRIDE { + HigherLayeredPool* higher_pool) override { base_.RemoveHigherLayeredPool(higher_pool); } virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE { + bool include_nested_pools) const override { return base_.GetInfoAsValue(name, type); } - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE { + virtual base::TimeDelta ConnectionTimeout() const override { return base_.ConnectionTimeout(); } - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE { + virtual ClientSocketPoolHistograms* histograms() const override { return base_.histograms(); } @@ -653,7 +653,7 @@ class TestConnectJobDelegate : public ConnectJob::Delegate { : have_result_(false), waiting_for_result_(false), result_(OK) {} virtual ~TestConnectJobDelegate() {} - virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE { + virtual void OnConnectJobComplete(int result, ConnectJob* job) override { result_ = result; scoped_ptr<ConnectJob> owned_job(job); scoped_ptr<StreamSocket> socket = owned_job->PassSocket(); diff --git a/net/socket/client_socket_pool_manager_impl.h b/net/socket/client_socket_pool_manager_impl.h index 22afbfa..94fd55d 100644 --- a/net/socket/client_socket_pool_manager_impl.h +++ b/net/socket/client_socket_pool_manager_impl.h @@ -73,29 +73,29 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe, HttpNetworkSession::SocketPoolType pool_type); virtual ~ClientSocketPoolManagerImpl(); - virtual void FlushSocketPoolsWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; + virtual void FlushSocketPoolsWithError(int error) override; + virtual void CloseIdleSockets() override; - virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE; + virtual TransportClientSocketPool* GetTransportSocketPool() override; - virtual SSLClientSocketPool* GetSSLSocketPool() OVERRIDE; + virtual SSLClientSocketPool* GetSSLSocketPool() override; virtual SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy( - const HostPortPair& socks_proxy) OVERRIDE; + const HostPortPair& socks_proxy) override; virtual HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy( - const HostPortPair& http_proxy) OVERRIDE; + const HostPortPair& http_proxy) override; virtual SSLClientSocketPool* GetSocketPoolForSSLWithProxy( - const HostPortPair& proxy_server) OVERRIDE; + const HostPortPair& proxy_server) override; // Creates a Value summary of the state of the socket pools. The caller is // responsible for deleting the returned value. - virtual base::Value* SocketPoolInfoToValue() const OVERRIDE; + virtual base::Value* SocketPoolInfoToValue() const override; // CertDatabase::Observer methods: - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE; - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE; + virtual void OnCertAdded(const X509Certificate* cert) override; + virtual void OnCACertChanged(const X509Certificate* cert) override; private: typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*> diff --git a/net/socket/mock_client_socket_pool_manager.h b/net/socket/mock_client_socket_pool_manager.h index c2c3792..03930e3 100644 --- a/net/socket/mock_client_socket_pool_manager.h +++ b/net/socket/mock_client_socket_pool_manager.h @@ -27,17 +27,17 @@ class MockClientSocketPoolManager : public ClientSocketPoolManager { SSLClientSocketPool* pool); // ClientSocketPoolManager methods: - virtual void FlushSocketPoolsWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; - virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE; - virtual SSLClientSocketPool* GetSSLSocketPool() OVERRIDE; + virtual void FlushSocketPoolsWithError(int error) override; + virtual void CloseIdleSockets() override; + virtual TransportClientSocketPool* GetTransportSocketPool() override; + virtual SSLClientSocketPool* GetSSLSocketPool() override; virtual SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy( - const HostPortPair& socks_proxy) OVERRIDE; + const HostPortPair& socks_proxy) override; virtual HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy( - const HostPortPair& http_proxy) OVERRIDE; + const HostPortPair& http_proxy) override; virtual SSLClientSocketPool* GetSocketPoolForSSLWithProxy( - const HostPortPair& proxy_server) OVERRIDE; - virtual base::Value* SocketPoolInfoToValue() const OVERRIDE; + const HostPortPair& proxy_server) override; + virtual base::Value* SocketPoolInfoToValue() const override; private: typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*> diff --git a/net/socket/socket_libevent.h b/net/socket/socket_libevent.h index 5950951..a072738 100644 --- a/net/socket/socket_libevent.h +++ b/net/socket/socket_libevent.h @@ -81,8 +81,8 @@ class NET_EXPORT_PRIVATE SocketLibevent private: // base::MessageLoopForIO::Watcher methods. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; int DoAccept(scoped_ptr<SocketLibevent>* socket); void AcceptCompleted(); diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 50d28ec..1496aec 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -262,9 +262,9 @@ class StaticSocketDataProvider : public SocketDataProvider { virtual void CompleteRead() {} // SocketDataProvider implementation. - virtual MockRead GetNextRead() OVERRIDE; - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE; - virtual void Reset() OVERRIDE; + virtual MockRead GetNextRead() override; + virtual MockWriteResult OnWrite(const std::string& data) override; + virtual void Reset() override; private: MockRead* reads_; @@ -292,9 +292,9 @@ class DynamicSocketDataProvider : public SocketDataProvider { void allow_unconsumed_reads(bool allow) { allow_unconsumed_reads_ = allow; } // SocketDataProvider implementation. - virtual MockRead GetNextRead() OVERRIDE; + virtual MockRead GetNextRead() override; virtual MockWriteResult OnWrite(const std::string& data) = 0; - virtual void Reset() OVERRIDE; + virtual void Reset() override; protected: // The next time there is a read from this socket, it will return |data|. @@ -376,10 +376,10 @@ class DelayedSocketData : public StaticSocketDataProvider { void ForceNextRead(); // StaticSocketDataProvider: - virtual MockRead GetNextRead() OVERRIDE; - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void CompleteRead() OVERRIDE; + virtual MockRead GetNextRead() override; + virtual MockWriteResult OnWrite(const std::string& data) override; + virtual void Reset() override; + virtual void CompleteRead() override; private: int write_delay_; @@ -430,10 +430,10 @@ class OrderedSocketData : public StaticSocketDataProvider { void EndLoop(); // StaticSocketDataProvider: - virtual MockRead GetNextRead() OVERRIDE; - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void CompleteRead() OVERRIDE; + virtual MockRead GetNextRead() override; + virtual MockWriteResult OnWrite(const std::string& data) override; + virtual void Reset() override; + virtual void CompleteRead() override; private: int sequence_number_; @@ -560,14 +560,14 @@ class DeterministicSocketData : public StaticSocketDataProvider { // When the socket calls Read(), that calls GetNextRead(), and expects either // ERR_IO_PENDING or data. - virtual MockRead GetNextRead() OVERRIDE; + virtual MockRead GetNextRead() override; // When the socket calls Write(), it always completes synchronously. OnWrite() // checks to make sure the written data matches the expected data. The // callback will not be invoked until its sequence number is reached. - virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void CompleteRead() OVERRIDE {} + virtual MockWriteResult OnWrite(const std::string& data) override; + virtual void Reset() override; + virtual void CompleteRead() override {} private: // Invoke the read and write callbacks, if the timing is appropriate. @@ -654,17 +654,17 @@ class MockClientSocketFactory : public ClientSocketFactory { DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, NetLog* net_log, - const NetLog::Source& source) OVERRIDE; + const NetLog::Source& source) override; virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, NetLog* net_log, - const NetLog::Source& source) OVERRIDE; + const NetLog::Source& source) override; virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket( scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE; - virtual void ClearSSLSessionCache() OVERRIDE; + const SSLClientSocketContext& context) override; + virtual void ClearSSLSessionCache() override; private: SocketDataProviderArray<SocketDataProvider> mock_data_; @@ -688,34 +688,34 @@ class MockClientSocket : public SSLClientSocket { virtual int Write(IOBuffer* buf, int buf_len, const CompletionCallback& callback) = 0; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; // StreamSocket implementation. virtual int Connect(const CompletionCallback& callback) = 0; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} // SSLClientSocket implementation. - virtual std::string GetSessionCacheKey() const OVERRIDE; - virtual bool InSessionCache() const OVERRIDE; - virtual void SetHandshakeCompletionCallback(const base::Closure& cb) OVERRIDE; + virtual std::string GetSessionCacheKey() const override; + virtual bool InSessionCache() const override; + virtual void SetHandshakeCompletionCallback(const base::Closure& cb) override; virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) - OVERRIDE; + override; virtual int ExportKeyingMaterial(const base::StringPiece& label, bool has_context, const base::StringPiece& context, unsigned char* out, - unsigned int outlen) OVERRIDE; - virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; - virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; - virtual ChannelIDService* GetChannelIDService() const OVERRIDE; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) override; + virtual NextProtoStatus GetNextProto(std::string* proto) override; + virtual ChannelIDService* GetChannelIDService() const override; protected: virtual ~MockClientSocket(); @@ -724,7 +724,7 @@ class MockClientSocket : public SSLClientSocket { // SSLClientSocket implementation. virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() - const OVERRIDE; + const override; // True if Connect completed successfully and Disconnect hasn't been called. bool connected_; @@ -752,25 +752,25 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket { // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // AsyncSocket: - virtual void OnReadComplete(const MockRead& data) OVERRIDE; - virtual void OnConnectComplete(const MockConnect& data) OVERRIDE; + virtual void OnReadComplete(const MockRead& data) override; + virtual void OnConnectComplete(const MockConnect& data) override; private: int CompleteRead(); @@ -854,33 +854,33 @@ class DeterministicMockUDPClientSocket virtual ~DeterministicMockUDPClientSocket(); // DeterministicSocketData::Delegate: - virtual bool WritePending() const OVERRIDE; - virtual bool ReadPending() const OVERRIDE; - virtual void CompleteWrite() OVERRIDE; - virtual int CompleteRead() OVERRIDE; + virtual bool WritePending() const override; + virtual bool ReadPending() const override; + virtual void CompleteWrite() override; + virtual int CompleteRead() override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; // DatagramSocket implementation. - virtual void Close() OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; + virtual void Close() override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; // DatagramClientSocket implementation. - virtual int Connect(const IPEndPoint& address) OVERRIDE; + virtual int Connect(const IPEndPoint& address) override; // AsyncSocket implementation. - virtual void OnReadComplete(const MockRead& data) OVERRIDE; - virtual void OnConnectComplete(const MockConnect& data) OVERRIDE; + virtual void OnReadComplete(const MockRead& data) override; + virtual void OnConnectComplete(const MockConnect& data) override; void set_source_port(int port) { source_port_ = port; } @@ -905,32 +905,32 @@ class DeterministicMockTCPClientSocket virtual ~DeterministicMockTCPClientSocket(); // DeterministicSocketData::Delegate: - virtual bool WritePending() const OVERRIDE; - virtual bool ReadPending() const OVERRIDE; - virtual void CompleteWrite() OVERRIDE; - virtual int CompleteRead() OVERRIDE; + virtual bool WritePending() const override; + virtual bool ReadPending() const override; + virtual void CompleteWrite() override; + virtual int CompleteRead() override; // Socket: virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // StreamSocket: - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // AsyncSocket: - virtual void OnReadComplete(const MockRead& data) OVERRIDE; - virtual void OnConnectComplete(const MockConnect& data) OVERRIDE; + virtual void OnReadComplete(const MockRead& data) override; + virtual void OnConnectComplete(const MockConnect& data) override; private: DeterministicSocketHelper helper_; @@ -949,39 +949,39 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual bool WasNpnNegotiated() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // SSLClientSocket implementation. - virtual std::string GetSessionCacheKey() const OVERRIDE; - virtual bool InSessionCache() const OVERRIDE; - virtual void SetHandshakeCompletionCallback(const base::Closure& cb) OVERRIDE; + virtual std::string GetSessionCacheKey() const override; + virtual bool InSessionCache() const override; + virtual void SetHandshakeCompletionCallback(const base::Closure& cb) override; virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) - OVERRIDE; - virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; - virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE; - virtual void set_protocol_negotiated(NextProto protocol_negotiated) OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; + override; + virtual NextProtoStatus GetNextProto(std::string* proto) override; + virtual bool set_was_npn_negotiated(bool negotiated) override; + virtual void set_protocol_negotiated(NextProto protocol_negotiated) override; + virtual NextProto GetNegotiatedProtocol() const override; // This MockSocket does not implement the manual async IO feature. - virtual void OnReadComplete(const MockRead& data) OVERRIDE; - virtual void OnConnectComplete(const MockConnect& data) OVERRIDE; + virtual void OnReadComplete(const MockRead& data) override; + virtual void OnConnectComplete(const MockConnect& data) override; - virtual bool WasChannelIDSent() const OVERRIDE; - virtual void set_channel_id_sent(bool channel_id_sent) OVERRIDE; - virtual ChannelIDService* GetChannelIDService() const OVERRIDE; + virtual bool WasChannelIDSent() const override; + virtual void set_channel_id_sent(bool channel_id_sent) override; + virtual ChannelIDService* GetChannelIDService() const override; bool reached_connect() const { return reached_connect_; } @@ -1033,25 +1033,25 @@ class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket { // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; // DatagramSocket implementation. - virtual void Close() OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; + virtual void Close() override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; // DatagramClientSocket implementation. - virtual int Connect(const IPEndPoint& address) OVERRIDE; + virtual int Connect(const IPEndPoint& address) override; // AsyncSocket implementation. - virtual void OnReadComplete(const MockRead& data) OVERRIDE; - virtual void OnConnectComplete(const MockConnect& data) OVERRIDE; + virtual void OnReadComplete(const MockRead& data) override; + virtual void OnConnectComplete(const MockConnect& data) override; void set_source_port(int port) { source_port_ = port;} @@ -1221,13 +1221,13 @@ class MockTransportClientSocketPool : public TransportClientSocketPool { RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE; + ClientSocketHandle* handle) override; virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE; + int id) override; private: ClientSocketFactory* client_socket_factory_; @@ -1267,17 +1267,17 @@ class DeterministicMockClientSocketFactory : public ClientSocketFactory { DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, NetLog* net_log, - const NetLog::Source& source) OVERRIDE; + const NetLog::Source& source) override; virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, NetLog* net_log, - const NetLog::Source& source) OVERRIDE; + const NetLog::Source& source) override; virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket( scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE; - virtual void ClearSSLSessionCache() OVERRIDE; + const SSLClientSocketContext& context) override; + virtual void ClearSSLSessionCache() override; private: SocketDataProviderArray<DeterministicSocketData> mock_data_; @@ -1306,13 +1306,13 @@ class MockSOCKSClientSocketPool : public SOCKSClientSocketPool { RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE; + ClientSocketHandle* handle) override; virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE; + int id) override; private: TransportClientSocketPool* const transport_pool_; diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index 8da0b4d..5d4e060 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -43,32 +43,32 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { // StreamSocket implementation. // Does the SOCKS handshake and completes the protocol. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; private: enum State { diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h index 26da332..d480de4 100644 --- a/net/socket/socks_client_socket.h +++ b/net/socket/socks_client_socket.h @@ -40,32 +40,32 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { // StreamSocket implementation. // Does the SOCKS handshake and completes the protocol. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; private: FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, CompleteHandshake); diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h index c6d5c8d..d324f0a 100644 --- a/net/socket/socks_client_socket_pool.h +++ b/net/socket/socks_client_socket_pool.h @@ -66,7 +66,7 @@ class SOCKSConnectJob : public ConnectJob { virtual ~SOCKSConnectJob(); // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; private: enum State { @@ -90,7 +90,7 @@ class SOCKSConnectJob : public ConnectJob { // Begins the transport connection and the SOCKS handshake. Returns OK on // success and ERR_IO_PENDING if it cannot immediately service the request. // Otherwise, it returns a net error code. - virtual int ConnectInternal() OVERRIDE; + virtual int ConnectInternal() override; scoped_refptr<SOCKSSocketParams> socks_params_; TransportClientSocketPool* const transport_pool_; @@ -125,51 +125,51 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE; + ClientSocketHandle* handle) override; virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE; + int id) override; - virtual void FlushWithError(int error) OVERRIDE; + virtual void FlushWithError(int error) override; - virtual void CloseIdleSockets() OVERRIDE; + virtual void CloseIdleSockets() override; - virtual int IdleSocketCount() const OVERRIDE; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; + bool include_nested_pools) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + virtual ClientSocketPoolHistograms* histograms() const override; // LowerLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; + virtual bool IsStalled() const override; - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; // HigherLayeredPool implementation. - virtual bool CloseOneIdleConnection() OVERRIDE; + virtual bool CloseOneIdleConnection() override; private: typedef ClientSocketPoolBase<SOCKSSocketParams> PoolBase; @@ -189,9 +189,9 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE; + ConnectJob::Delegate* delegate) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; private: TransportClientSocketPool* const transport_pool_; diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index c8032e6..e3dc359 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -101,7 +101,7 @@ class HangingHostResolverWithCancel : public HostResolver { AddressList* addresses, const CompletionCallback& callback, RequestHandle* out_req, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { DCHECK(addresses); DCHECK_EQ(false, callback.is_null()); EXPECT_FALSE(HasOutstandingRequest()); @@ -112,12 +112,12 @@ class HangingHostResolverWithCancel : public HostResolver { virtual int ResolveFromCache(const RequestInfo& info, AddressList* addresses, - const BoundNetLog& net_log) OVERRIDE { + const BoundNetLog& net_log) override { NOTIMPLEMENTED(); return ERR_UNEXPECTED; } - virtual void CancelRequest(RequestHandle req) OVERRIDE { + virtual void CancelRequest(RequestHandle req) override { EXPECT_TRUE(HasOutstandingRequest()); EXPECT_EQ(outstanding_request_, req); outstanding_request_ = NULL; diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h index 0e32ed6..98eb7741 100644 --- a/net/socket/ssl_client_socket.h +++ b/net/socket/ssl_client_socket.h @@ -80,8 +80,8 @@ class NET_EXPORT SSLClientSocket : public SSLSocket { }; // StreamSocket: - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; // Computes a unique key string for the SSL session cache. virtual std::string GetSessionCacheKey() const = 0; diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index a2dc610..ccdbb81 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -68,51 +68,51 @@ class SSLClientSocketNSS : public SSLClientSocket { virtual ~SSLClientSocketNSS(); // SSLClientSocket implementation. - virtual std::string GetSessionCacheKey() const OVERRIDE; - virtual bool InSessionCache() const OVERRIDE; + virtual std::string GetSessionCacheKey() const override; + virtual bool InSessionCache() const override; virtual void SetHandshakeCompletionCallback( - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual NextProtoStatus GetNextProto(std::string* proto) override; // SSLSocket implementation. virtual int ExportKeyingMaterial(const base::StringPiece& label, bool has_context, const base::StringPiece& context, unsigned char* out, - unsigned int outlen) OVERRIDE; - virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; - virtual ChannelIDService* GetChannelIDService() const OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; + virtual ChannelIDService* GetChannelIDService() const override; protected: // SSLClientSocket implementation. virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() - const OVERRIDE; + const override; private: // Helper class to handle marshalling any NSS interaction to and from the diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index 1465f845..dff457b 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.h @@ -59,49 +59,49 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { } // SSLClientSocket implementation. - virtual std::string GetSessionCacheKey() const OVERRIDE; - virtual bool InSessionCache() const OVERRIDE; + virtual std::string GetSessionCacheKey() const override; + virtual bool InSessionCache() const override; virtual void SetHandshakeCompletionCallback( - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; - virtual ChannelIDService* GetChannelIDService() const OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual NextProtoStatus GetNextProto(std::string* proto) override; + virtual ChannelIDService* GetChannelIDService() const override; // SSLSocket implementation. virtual int ExportKeyingMaterial(const base::StringPiece& label, bool has_context, const base::StringPiece& context, unsigned char* out, - unsigned int outlen) OVERRIDE; - virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; protected: // SSLClientSocket implementation. virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() - const OVERRIDE; + const override; private: class PeerCertificateChain; diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index efcce77..58540157 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_client_socket_pool.h @@ -197,9 +197,9 @@ class SSLConnectJob : public ConnectJob { virtual ~SSLConnectJob(); // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; - virtual void GetAdditionalErrorState(ClientSocketHandle * handle) OVERRIDE; + virtual void GetAdditionalErrorState(ClientSocketHandle * handle) override; private: enum State { @@ -242,7 +242,7 @@ class SSLConnectJob : public ConnectJob { // Starts the SSL connection process. Returns OK on success and // ERR_IO_PENDING if it cannot immediately service the request. // Otherwise, it returns a net error code. - virtual int ConnectInternal() OVERRIDE; + virtual int ConnectInternal() override; scoped_refptr<SSLSocketParams> params_; TransportClientSocketPool* const transport_pool_; @@ -302,51 +302,51 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE; + ClientSocketHandle* handle) override; virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE; + int id) override; - virtual void FlushWithError(int error) OVERRIDE; + virtual void FlushWithError(int error) override; - virtual void CloseIdleSockets() OVERRIDE; + virtual void CloseIdleSockets() override; - virtual int IdleSocketCount() const OVERRIDE; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; + bool include_nested_pools) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + virtual ClientSocketPoolHistograms* histograms() const override; // LowerLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; + virtual bool IsStalled() const override; - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; // HigherLayeredPool implementation. - virtual bool CloseOneIdleConnection() OVERRIDE; + virtual bool CloseOneIdleConnection() override; // Gets the SSLConnectJobMessenger for the given ssl session |cache_key|. If // none exits, it creates one and stores it in |messenger_map_|. @@ -363,7 +363,7 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool // When the user changes the SSL config, we flush all idle sockets so they // won't get re-used. - virtual void OnSSLConfigChanged() OVERRIDE; + virtual void OnSSLConfigChanged() override; class SSLConnectJobFactory : public PoolBase::ConnectJobFactory { public: @@ -383,9 +383,9 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE; + ConnectJob::Delegate* delegate) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; private: TransportClientSocketPool* const transport_pool_; diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 4e844cd..40a4d3c 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -60,62 +60,62 @@ class WrappedStreamSocket : public StreamSocket { virtual ~WrappedStreamSocket() {} // StreamSocket implementation: - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return transport_->Connect(callback); } - virtual void Disconnect() OVERRIDE { transport_->Disconnect(); } - virtual bool IsConnected() const OVERRIDE { + virtual void Disconnect() override { transport_->Disconnect(); } + virtual bool IsConnected() const override { return transport_->IsConnected(); } - virtual bool IsConnectedAndIdle() const OVERRIDE { + virtual bool IsConnectedAndIdle() const override { return transport_->IsConnectedAndIdle(); } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { return transport_->GetPeerAddress(address); } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { return transport_->GetLocalAddress(address); } - virtual const BoundNetLog& NetLog() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return transport_->NetLog(); } - virtual void SetSubresourceSpeculation() OVERRIDE { + virtual void SetSubresourceSpeculation() override { transport_->SetSubresourceSpeculation(); } - virtual void SetOmniboxSpeculation() OVERRIDE { + virtual void SetOmniboxSpeculation() override { transport_->SetOmniboxSpeculation(); } - virtual bool WasEverUsed() const OVERRIDE { + virtual bool WasEverUsed() const override { return transport_->WasEverUsed(); } - virtual bool UsingTCPFastOpen() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return transport_->UsingTCPFastOpen(); } - virtual bool WasNpnNegotiated() const OVERRIDE { + virtual bool WasNpnNegotiated() const override { return transport_->WasNpnNegotiated(); } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return transport_->GetNegotiatedProtocol(); } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return transport_->GetSSLInfo(ssl_info); } // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return transport_->Read(buf, buf_len, callback); } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return transport_->Write(buf, buf_len, callback); } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { + virtual int SetReceiveBufferSize(int32 size) override { return transport_->SetReceiveBufferSize(size); } - virtual int SetSendBufferSize(int32 size) OVERRIDE { + virtual int SetSendBufferSize(int32 size) override { return transport_->SetSendBufferSize(size); } @@ -137,7 +137,7 @@ class ReadBufferingStreamSocket : public WrappedStreamSocket { // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // Sets the internal buffer to |size|. This must not be greater than // the largest value supplied to Read() - that is, it does not handle @@ -267,10 +267,10 @@ class SynchronousErrorStreamSocket : public WrappedStreamSocket { // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // Sets the next Read() call and all future calls to return |error|. // If there is already a pending asynchronous read, the configured error @@ -338,10 +338,10 @@ class FakeBlockingStreamSocket : public WrappedStreamSocket { // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // Blocks read results on the socket. Reads will not complete until // UnblockReadResult() has been called and a result is ready from the @@ -554,13 +554,13 @@ class CountingStreamSocket : public WrappedStreamSocket { // Socket implementation: virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { read_count_++; return transport_->Read(buf, buf_len, callback); } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { write_count_++; return transport_->Write(buf, buf_len, callback); } @@ -609,26 +609,26 @@ class FailingChannelIDStore : public ChannelIDStore { base::Time* expiration_time, std::string* private_key_result, std::string* cert_result, - const GetChannelIDCallback& callback) OVERRIDE { + const GetChannelIDCallback& callback) override { return ERR_UNEXPECTED; } virtual void SetChannelID(const std::string& server_identifier, base::Time creation_time, base::Time expiration_time, const std::string& private_key, - const std::string& cert) OVERRIDE {} + const std::string& cert) override {} virtual void DeleteChannelID(const std::string& server_identifier, const base::Closure& completion_callback) - OVERRIDE {} + override {} virtual void DeleteAllCreatedBetween(base::Time delete_begin, base::Time delete_end, const base::Closure& completion_callback) - OVERRIDE {} - virtual void DeleteAll(const base::Closure& completion_callback) OVERRIDE {} + override {} + virtual void DeleteAll(const base::Closure& completion_callback) override {} virtual void GetAllChannelIDs(const GetChannelIDListCallback& callback) - OVERRIDE {} - virtual int GetChannelIDCount() OVERRIDE { return 0; } - virtual void SetForceKeepSessionState() OVERRIDE {} + override {} + virtual int GetChannelIDCount() override { return 0; } + virtual void SetForceKeepSessionState() override {} }; // A ChannelIDStore that asynchronously returns an error when asked for a @@ -638,7 +638,7 @@ class AsyncFailingChannelIDStore : public ChannelIDStore { base::Time* expiration_time, std::string* private_key_result, std::string* cert_result, - const GetChannelIDCallback& callback) OVERRIDE { + const GetChannelIDCallback& callback) override { base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(callback, ERR_UNEXPECTED, server_identifier, base::Time(), "", "")); @@ -648,19 +648,19 @@ class AsyncFailingChannelIDStore : public ChannelIDStore { base::Time creation_time, base::Time expiration_time, const std::string& private_key, - const std::string& cert) OVERRIDE {} + const std::string& cert) override {} virtual void DeleteChannelID(const std::string& server_identifier, const base::Closure& completion_callback) - OVERRIDE {} + override {} virtual void DeleteAllCreatedBetween(base::Time delete_begin, base::Time delete_end, const base::Closure& completion_callback) - OVERRIDE {} - virtual void DeleteAll(const base::Closure& completion_callback) OVERRIDE {} + override {} + virtual void DeleteAll(const base::Closure& completion_callback) override {} virtual void GetAllChannelIDs(const GetChannelIDListCallback& callback) - OVERRIDE {} - virtual int GetChannelIDCount() OVERRIDE { return 0; } - virtual void SetForceKeepSessionState() OVERRIDE {} + override {} + virtual int GetChannelIDCount() override { return 0; } + virtual void SetForceKeepSessionState() override {} }; // A mock CTVerifier that records every call to Verify but doesn't verify diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h index bc5b65d..eddb543 100644 --- a/net/socket/ssl_server_socket_nss.h +++ b/net/socket/ssl_server_socket_nss.h @@ -31,39 +31,39 @@ class SSLServerSocketNSS : public SSLServerSocket { virtual ~SSLServerSocketNSS(); // SSLServerSocket interface. - virtual int Handshake(const CompletionCallback& callback) OVERRIDE; + virtual int Handshake(const CompletionCallback& callback) override; // SSLSocket interface. virtual int ExportKeyingMaterial(const base::StringPiece& label, bool has_context, const base::StringPiece& context, unsigned char* out, - unsigned int outlen) OVERRIDE; - virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) override; // Socket interface (via StreamSocket). virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; private: enum State { diff --git a/net/socket/ssl_server_socket_openssl.h b/net/socket/ssl_server_socket_openssl.h index e1c8aad..379ca57 100644 --- a/net/socket/ssl_server_socket_openssl.h +++ b/net/socket/ssl_server_socket_openssl.h @@ -33,39 +33,39 @@ class SSLServerSocketOpenSSL : public SSLServerSocket { virtual ~SSLServerSocketOpenSSL(); // SSLServerSocket interface. - virtual int Handshake(const CompletionCallback& callback) OVERRIDE; + virtual int Handshake(const CompletionCallback& callback) override; // SSLSocket interface. virtual int ExportKeyingMaterial(const base::StringPiece& label, bool has_context, const base::StringPiece& context, unsigned char* out, - unsigned int outlen) OVERRIDE; - virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; + unsigned int outlen) override; + virtual int GetTLSUniqueChannelBinding(std::string* out) override; // Socket interface (via StreamSocket). virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; private: enum State { diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index f28d51a..1d70258 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc @@ -171,81 +171,81 @@ class FakeSocket : public StreamSocket { } virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { // Read random number of bytes. buf_len = rand() % buf_len + 1; return incoming_->Read(buf, buf_len, callback); } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { // Write random number of bytes. buf_len = rand() % buf_len + 1; return outgoing_->Write(buf, buf_len, callback); } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { + virtual int SetReceiveBufferSize(int32 size) override { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { + virtual int SetSendBufferSize(int32 size) override { return OK; } - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return OK; } - virtual void Disconnect() OVERRIDE { + virtual void Disconnect() override { incoming_->Close(); outgoing_->Close(); } - virtual bool IsConnected() const OVERRIDE { + virtual bool IsConnected() const override { return true; } - virtual bool IsConnectedAndIdle() const OVERRIDE { + virtual bool IsConnectedAndIdle() const override { return true; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { IPAddressNumber ip_address(kIPv4AddressSize); *address = IPEndPoint(ip_address, 0 /*port*/); return OK; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { IPAddressNumber ip_address(4); *address = IPEndPoint(ip_address, 0); return OK; } - virtual const BoundNetLog& NetLog() const OVERRIDE { + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} - virtual bool WasEverUsed() const OVERRIDE { + virtual bool WasEverUsed() const override { return true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { + virtual bool WasNpnNegotiated() const override { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } diff --git a/net/socket/stream_listen_socket.h b/net/socket/stream_listen_socket.h index 813d96a..ead35c4 100644 --- a/net/socket/stream_listen_socket.h +++ b/net/socket/stream_listen_socket.h @@ -116,8 +116,8 @@ class NET_EXPORT StreamListenSocket HANDLE socket_event_; #elif defined(OS_POSIX) // Called by MessagePumpLibevent when the socket is ready to do I/O. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; WaitState wait_state_; // The socket's libevent wrapper. base::MessageLoopForIO::FileDescriptorWatcher watcher_; diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h index 9322624..1672a95 100644 --- a/net/socket/tcp_client_socket.h +++ b/net/socket/tcp_client_socket.h @@ -38,31 +38,31 @@ class NET_EXPORT TCPClientSocket : public StreamSocket { int Bind(const IPEndPoint& address); // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual void EnableTCPFastOpenIfSupported() OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual void EnableTCPFastOpenIfSupported() override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. // Multiple outstanding requests are not supported. // Full duplex mode (reading and writing at the same time) is supported. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; virtual bool SetKeepAlive(bool enable, int delay); virtual bool SetNoDelay(bool no_delay); diff --git a/net/socket/tcp_listen_socket.h b/net/socket/tcp_listen_socket.h index 54a91de..d726dcc84 100644 --- a/net/socket/tcp_listen_socket.h +++ b/net/socket/tcp_listen_socket.h @@ -34,7 +34,7 @@ class NET_EXPORT TCPListenSocket : public StreamListenSocket { TCPListenSocket(SocketDescriptor s, StreamListenSocket::Delegate* del); // Implements StreamListenSocket::Accept. - virtual void Accept() OVERRIDE; + virtual void Accept() override; private: DISALLOW_COPY_AND_ASSIGN(TCPListenSocket); @@ -48,7 +48,7 @@ class NET_EXPORT TCPListenSocketFactory : public StreamListenSocketFactory { // StreamListenSocketFactory overrides. virtual scoped_ptr<StreamListenSocket> CreateAndListen( - StreamListenSocket::Delegate* delegate) const OVERRIDE; + StreamListenSocket::Delegate* delegate) const override; private: const std::string ip_; diff --git a/net/socket/tcp_listen_socket_unittest.h b/net/socket/tcp_listen_socket_unittest.h index 1bc31a8..9393370 100644 --- a/net/socket/tcp_listen_socket_unittest.h +++ b/net/socket/tcp_listen_socket_unittest.h @@ -91,10 +91,10 @@ class TCPListenSocketTester : // StreamListenSocket::Delegate: virtual void DidAccept(StreamListenSocket* server, - scoped_ptr<StreamListenSocket> connection) OVERRIDE; + scoped_ptr<StreamListenSocket> connection) override; virtual void DidRead(StreamListenSocket* connection, const char* data, - int len) OVERRIDE; - virtual void DidClose(StreamListenSocket* sock) OVERRIDE; + int len) override; + virtual void DidClose(StreamListenSocket* sock) override; scoped_ptr<base::Thread> thread_; base::MessageLoopForIO* loop_; diff --git a/net/socket/tcp_server_socket.h b/net/socket/tcp_server_socket.h index faff9ad..9fc719ad 100644 --- a/net/socket/tcp_server_socket.h +++ b/net/socket/tcp_server_socket.h @@ -22,10 +22,10 @@ class NET_EXPORT_PRIVATE TCPServerSocket : public ServerSocket { virtual ~TCPServerSocket(); // net::ServerSocket implementation. - virtual int Listen(const IPEndPoint& address, int backlog) OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + virtual int Listen(const IPEndPoint& address, int backlog) override; + virtual int GetLocalAddress(IPEndPoint* address) const override; virtual int Accept(scoped_ptr<StreamSocket>* socket, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; private: // Converts |accepted_socket_| and stores the result in diff --git a/net/socket/tcp_socket_win.h b/net/socket/tcp_socket_win.h index a5eed419..80174ad 100644 --- a/net/socket/tcp_socket_win.h +++ b/net/socket/tcp_socket_win.h @@ -101,7 +101,7 @@ class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe), class Core; // base::ObjectWatcher::Delegate implementation. - virtual void OnObjectSignaled(HANDLE object) OVERRIDE; + virtual void OnObjectSignaled(HANDLE object) override; int AcceptInternal(scoped_ptr<TCPSocketWin>* socket, IPEndPoint* address); diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h index fce5432..14af726 100644 --- a/net/socket/transport_client_socket_pool.h +++ b/net/socket/transport_client_socket_pool.h @@ -167,7 +167,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob { virtual ~TransportConnectJob(); // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; // Rolls |addrlist| forward until the first IPv4 address, if any. // WARNING: this method should only be used to implement the prefer-IPv4 hack. @@ -194,7 +194,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob { // Begins the host resolution and the TCP connect. Returns OK on success // and ERR_IO_PENDING if it cannot immediately service the request. // Otherwise, it returns a net error code. - virtual int ConnectInternal() OVERRIDE; + virtual int ConnectInternal() override; TransportConnectJobHelper helper_; @@ -231,35 +231,35 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE; + ClientSocketHandle* handle) override; virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE; - virtual void FlushWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; - virtual int IdleSocketCount() const OVERRIDE; + int id) override; + virtual void FlushWithError(int error) override; + virtual void CloseIdleSockets() override; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + bool include_nested_pools) const override; + virtual base::TimeDelta ConnectionTimeout() const override; + virtual ClientSocketPoolHistograms* histograms() const override; // HigherLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; + virtual bool IsStalled() const override; + virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; + virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; protected: // Methods shared with WebSocketTransportClientSocketPool @@ -287,9 +287,9 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { virtual scoped_ptr<ConnectJob> NewConnectJob( const std::string& group_name, const PoolBase::Request& request, - ConnectJob::Delegate* delegate) const OVERRIDE; + ConnectJob::Delegate* delegate) const override; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; + virtual base::TimeDelta ConnectionTimeout() const override; private: ClientSocketFactory* const client_socket_factory_; diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc index 98a615d..a56c6b1 100644 --- a/net/socket/transport_client_socket_pool_test_util.cc +++ b/net/socket/transport_client_socket_pool_test_util.cc @@ -38,19 +38,19 @@ class MockConnectClientSocket : public StreamSocket { use_tcp_fastopen_(false) {} // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { connected_ = true; return OK; } - virtual void Disconnect() OVERRIDE { connected_ = false; } - virtual bool IsConnected() const OVERRIDE { return connected_; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return connected_; } + virtual void Disconnect() override { connected_ = false; } + virtual bool IsConnected() const override { return connected_; } + virtual bool IsConnectedAndIdle() const override { return connected_; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { *address = addrlist_.front(); return OK; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { if (!connected_) return ERR_SOCKET_NOT_CONNECTED; if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4) @@ -59,34 +59,34 @@ class MockConnectClientSocket : public StreamSocket { SetIPv6Address(address); return OK; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return net_log_; } + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { return false; } - virtual void EnableTCPFastOpenIfSupported() OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return false; } + virtual void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } + virtual bool WasNpnNegotiated() const override { return false; } + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } private: bool connected_; @@ -105,49 +105,49 @@ class MockFailingClientSocket : public StreamSocket { use_tcp_fastopen_(false) {} // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return ERR_CONNECTION_FAILED; } - virtual void Disconnect() OVERRIDE {} + virtual void Disconnect() override {} - virtual bool IsConnected() const OVERRIDE { return false; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return false; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual bool IsConnected() const override { return false; } + virtual bool IsConnectedAndIdle() const override { return false; } + virtual int GetPeerAddress(IPEndPoint* address) const override { return ERR_UNEXPECTED; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { return ERR_UNEXPECTED; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return net_log_; } + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { return false; } - virtual void EnableTCPFastOpenIfSupported() OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return false; } + virtual void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } + virtual bool WasNpnNegotiated() const override { return false; } + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } private: const AddressList addrlist_; @@ -211,21 +211,21 @@ class MockTriggerableClientSocket : public StreamSocket { } // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { DCHECK(callback_.is_null()); callback_ = callback; return ERR_IO_PENDING; } - virtual void Disconnect() OVERRIDE {} + virtual void Disconnect() override {} - virtual bool IsConnected() const OVERRIDE { return is_connected_; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return is_connected_; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual bool IsConnected() const override { return is_connected_; } + virtual bool IsConnectedAndIdle() const override { return is_connected_; } + virtual int GetPeerAddress(IPEndPoint* address) const override { *address = addrlist_.front(); return OK; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { if (!is_connected_) return ERR_SOCKET_NOT_CONNECTED; if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4) @@ -234,35 +234,35 @@ class MockTriggerableClientSocket : public StreamSocket { SetIPv6Address(address); return OK; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return net_log_; } + virtual const BoundNetLog& NetLog() const override { return net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE {} - virtual void SetOmniboxSpeculation() OVERRIDE {} - virtual bool WasEverUsed() const OVERRIDE { return false; } - virtual void EnableTCPFastOpenIfSupported() OVERRIDE { + virtual void SetSubresourceSpeculation() override {} + virtual void SetOmniboxSpeculation() override {} + virtual bool WasEverUsed() const override { return false; } + virtual void EnableTCPFastOpenIfSupported() override { use_tcp_fastopen_ = true; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return use_tcp_fastopen_; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { return use_tcp_fastopen_; } + virtual bool WasNpnNegotiated() const override { return false; } + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return OK; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return OK; } + virtual int SetReceiveBufferSize(int32 size) override { return OK; } + virtual int SetSendBufferSize(int32 size) override { return OK; } private: void DoCallback() { diff --git a/net/socket/transport_client_socket_pool_test_util.h b/net/socket/transport_client_socket_pool_test_util.h index 40ed1d1..b4adb71 100644 --- a/net/socket/transport_client_socket_pool_test_util.h +++ b/net/socket/transport_client_socket_pool_test_util.h @@ -73,20 +73,20 @@ class MockTransportClientSocketFactory : public ClientSocketFactory { DatagramSocket::BindType bind_type, const RandIntCallback& rand_int_cb, NetLog* net_log, - const NetLog::Source& source) OVERRIDE; + const NetLog::Source& source) override; virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( const AddressList& addresses, NetLog* /* net_log */, - const NetLog::Source& /* source */) OVERRIDE; + const NetLog::Source& /* source */) override; virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket( scoped_ptr<ClientSocketHandle> transport_socket, const HostPortPair& host_and_port, const SSLConfig& ssl_config, - const SSLClientSocketContext& context) OVERRIDE; + const SSLClientSocketContext& context) override; - virtual void ClearSSLSessionCache() OVERRIDE; + virtual void ClearSSLSessionCache() override; int allocation_count() const { return allocation_count_; } diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc index 5548b27..8bfb674 100644 --- a/net/socket/transport_client_socket_unittest.cc +++ b/net/socket/transport_client_socket_unittest.cc @@ -48,18 +48,18 @@ class TransportClientSocketTest // Implement StreamListenSocket::Delegate methods virtual void DidAccept(StreamListenSocket* server, - scoped_ptr<StreamListenSocket> connection) OVERRIDE { + scoped_ptr<StreamListenSocket> connection) override { connected_sock_.reset( static_cast<TCPListenSocket*>(connection.release())); } - virtual void DidRead(StreamListenSocket*, const char* str, int len) OVERRIDE { + virtual void DidRead(StreamListenSocket*, const char* str, int len) override { // TODO(dkegel): this might not be long enough to tickle some bugs. connected_sock_->Send(kServerReply, arraysize(kServerReply) - 1, false /* Don't append line feed */); if (close_server_socket_on_next_send_) CloseServerSocket(); } - virtual void DidClose(StreamListenSocket* sock) OVERRIDE {} + virtual void DidClose(StreamListenSocket* sock) override {} // Testcase hooks virtual void SetUp(); diff --git a/net/socket/unix_domain_client_socket_posix.h b/net/socket/unix_domain_client_socket_posix.h index d6f2445..e70694a 100644 --- a/net/socket/unix_domain_client_socket_posix.h +++ b/net/socket/unix_domain_client_socket_posix.h @@ -41,28 +41,28 @@ class NET_EXPORT UnixDomainClientSocket : public StreamSocket { SockaddrStorage* address); // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; // Releases ownership of underlying SocketDescriptor to caller. // Internal state is reset so that this object can be used again. diff --git a/net/socket/unix_domain_listen_socket_posix.h b/net/socket/unix_domain_listen_socket_posix.h index bbdbf5f..8b9ba8e 100644 --- a/net/socket/unix_domain_listen_socket_posix.h +++ b/net/socket/unix_domain_listen_socket_posix.h @@ -64,7 +64,7 @@ class NET_EXPORT UnixDomainListenSocket : public StreamListenSocket { bool use_abstract_namespace); // StreamListenSocket: - virtual void Accept() OVERRIDE; + virtual void Accept() override; AuthCallback auth_callback_; @@ -83,7 +83,7 @@ class NET_EXPORT UnixDomainListenSocketFactory // StreamListenSocketFactory: virtual scoped_ptr<StreamListenSocket> CreateAndListen( - StreamListenSocket::Delegate* delegate) const OVERRIDE; + StreamListenSocket::Delegate* delegate) const override; protected: const std::string path_; @@ -107,7 +107,7 @@ class NET_EXPORT UnixDomainListenSocketWithAbstractNamespaceFactory // UnixDomainListenSocketFactory: virtual scoped_ptr<StreamListenSocket> CreateAndListen( - StreamListenSocket::Delegate* delegate) const OVERRIDE; + StreamListenSocket::Delegate* delegate) const override; private: std::string fallback_path_; diff --git a/net/socket/unix_domain_listen_socket_posix_unittest.cc b/net/socket/unix_domain_listen_socket_posix_unittest.cc index 117c5c5..bea60c6 100644 --- a/net/socket/unix_domain_listen_socket_posix_unittest.cc +++ b/net/socket/unix_domain_listen_socket_posix_unittest.cc @@ -95,7 +95,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate { : event_manager_(event_manager) {} virtual void DidAccept(StreamListenSocket* server, - scoped_ptr<StreamListenSocket> connection) OVERRIDE { + scoped_ptr<StreamListenSocket> connection) override { LOG(ERROR) << __PRETTY_FUNCTION__; connection_ = connection.Pass(); Notify(EVENT_ACCEPT); @@ -103,7 +103,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate { virtual void DidRead(StreamListenSocket* connection, const char* data, - int len) OVERRIDE { + int len) override { { base::AutoLock lock(mutex_); DCHECK(len); @@ -112,7 +112,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate { Notify(EVENT_READ); } - virtual void DidClose(StreamListenSocket* sock) OVERRIDE { + virtual void DidClose(StreamListenSocket* sock) override { Notify(EVENT_CLOSE); } @@ -169,12 +169,12 @@ class UnixDomainListenSocketTestHelper : public testing::Test { return temp_dir_.path().Append(socket_name); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { event_manager_ = new EventManager(); socket_delegate_.reset(new TestListenSocketDelegate(event_manager_)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { socket_.reset(); socket_delegate_.reset(); event_manager_ = NULL; diff --git a/net/socket/unix_domain_server_socket_posix.h b/net/socket/unix_domain_server_socket_posix.h index 65b3fa1..8fd8b34 100644 --- a/net/socket/unix_domain_server_socket_posix.h +++ b/net/socket/unix_domain_server_socket_posix.h @@ -51,13 +51,13 @@ class NET_EXPORT UnixDomainServerSocket : public ServerSocket { Credentials* credentials); // ServerSocket implementation. - virtual int Listen(const IPEndPoint& address, int backlog) OVERRIDE; + virtual int Listen(const IPEndPoint& address, int backlog) override; virtual int ListenWithAddressAndPort(const std::string& unix_domain_path, int port_unused, - int backlog) OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + int backlog) override; + virtual int GetLocalAddress(IPEndPoint* address) const override; virtual int Accept(scoped_ptr<StreamSocket>* socket, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; // Accepts an incoming connection on |listen_socket_|, but passes back // a raw SocketDescriptor instead of a StreamSocket. diff --git a/net/socket/websocket_endpoint_lock_manager_unittest.cc b/net/socket/websocket_endpoint_lock_manager_unittest.cc index cfc6cc6..cafd1aa 100644 --- a/net/socket/websocket_endpoint_lock_manager_unittest.cc +++ b/net/socket/websocket_endpoint_lock_manager_unittest.cc @@ -22,57 +22,57 @@ class FakeStreamSocket : public StreamSocket { FakeStreamSocket() {} // StreamSocket implementation - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { return ERR_FAILED; } - virtual void Disconnect() OVERRIDE { return; } + virtual void Disconnect() override { return; } - virtual bool IsConnected() const OVERRIDE { return false; } + virtual bool IsConnected() const override { return false; } - virtual bool IsConnectedAndIdle() const OVERRIDE { return false; } + virtual bool IsConnectedAndIdle() const override { return false; } - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetPeerAddress(IPEndPoint* address) const override { return ERR_FAILED; } - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE { + virtual int GetLocalAddress(IPEndPoint* address) const override { return ERR_FAILED; } - virtual const BoundNetLog& NetLog() const OVERRIDE { return bound_net_log_; } + virtual const BoundNetLog& NetLog() const override { return bound_net_log_; } - virtual void SetSubresourceSpeculation() OVERRIDE { return; } - virtual void SetOmniboxSpeculation() OVERRIDE { return; } + virtual void SetSubresourceSpeculation() override { return; } + virtual void SetOmniboxSpeculation() override { return; } - virtual bool WasEverUsed() const OVERRIDE { return false; } + virtual bool WasEverUsed() const override { return false; } - virtual bool UsingTCPFastOpen() const OVERRIDE { return false; } + virtual bool UsingTCPFastOpen() const override { return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { return false; } + virtual bool WasNpnNegotiated() const override { return false; } - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { return false; } + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } // Socket implementation virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_FAILED; } - virtual int SetReceiveBufferSize(int32 size) OVERRIDE { return ERR_FAILED; } + virtual int SetReceiveBufferSize(int32 size) override { return ERR_FAILED; } - virtual int SetSendBufferSize(int32 size) OVERRIDE { return ERR_FAILED; } + virtual int SetSendBufferSize(int32 size) override { return ERR_FAILED; } private: BoundNetLog bound_net_log_; @@ -84,7 +84,7 @@ class FakeWaiter : public WebSocketEndpointLockManager::Waiter { public: FakeWaiter() : called_(false) {} - virtual void GotEndpointLock() OVERRIDE { + virtual void GotEndpointLock() override { CHECK(!called_); called_ = true; } diff --git a/net/socket/websocket_transport_client_socket_pool.h b/net/socket/websocket_transport_client_socket_pool.h index 74b8f78..e918354 100644 --- a/net/socket/websocket_transport_client_socket_pool.h +++ b/net/socket/websocket_transport_client_socket_pool.h @@ -65,7 +65,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportConnectJob : public ConnectJob { const BoundNetLog& request_net_log() const { return request_net_log_; } // ConnectJob methods. - virtual LoadState GetLoadState() const OVERRIDE; + virtual LoadState GetLoadState() const override; private: friend class WebSocketTransportConnectSubJob; @@ -90,7 +90,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportConnectJob : public ConnectJob { // Begins the host resolution and the TCP connect. Returns OK on success // and ERR_IO_PENDING if it cannot immediately service the request. // Otherwise, it returns a net error code. - virtual int ConnectInternal() OVERRIDE; + virtual int ConnectInternal() override; TransportConnectJobHelper helper_; @@ -138,33 +138,33 @@ class NET_EXPORT_PRIVATE WebSocketTransportClientSocketPool RequestPriority priority, ClientSocketHandle* handle, const CompletionCallback& callback, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void RequestSockets(const std::string& group_name, const void* params, int num_sockets, - const BoundNetLog& net_log) OVERRIDE; + const BoundNetLog& net_log) override; virtual void CancelRequest(const std::string& group_name, - ClientSocketHandle* handle) OVERRIDE; + ClientSocketHandle* handle) override; virtual void ReleaseSocket(const std::string& group_name, scoped_ptr<StreamSocket> socket, - int id) OVERRIDE; - virtual void FlushWithError(int error) OVERRIDE; - virtual void CloseIdleSockets() OVERRIDE; - virtual int IdleSocketCount() const OVERRIDE; + int id) override; + virtual void FlushWithError(int error) override; + virtual void CloseIdleSockets() override; + virtual int IdleSocketCount() const override; virtual int IdleSocketCountInGroup( - const std::string& group_name) const OVERRIDE; + const std::string& group_name) const override; virtual LoadState GetLoadState( const std::string& group_name, - const ClientSocketHandle* handle) const OVERRIDE; + const ClientSocketHandle* handle) const override; virtual base::DictionaryValue* GetInfoAsValue( const std::string& name, const std::string& type, - bool include_nested_pools) const OVERRIDE; - virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; - virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; + bool include_nested_pools) const override; + virtual base::TimeDelta ConnectionTimeout() const override; + virtual ClientSocketPoolHistograms* histograms() const override; // HigherLayeredPool implementation. - virtual bool IsStalled() const OVERRIDE; + virtual bool IsStalled() const override; private: class ConnectJobDelegate : public ConnectJob::Delegate { @@ -172,7 +172,7 @@ class NET_EXPORT_PRIVATE WebSocketTransportClientSocketPool explicit ConnectJobDelegate(WebSocketTransportClientSocketPool* owner); virtual ~ConnectJobDelegate(); - virtual void OnConnectJobComplete(int result, ConnectJob* job) OVERRIDE; + virtual void OnConnectJobComplete(int result, ConnectJob* job) override; private: WebSocketTransportClientSocketPool* owner_; diff --git a/net/socket/websocket_transport_connect_sub_job.h b/net/socket/websocket_transport_connect_sub_job.h index 79980d2..e6f81e82 100644 --- a/net/socket/websocket_transport_connect_sub_job.h +++ b/net/socket/websocket_transport_connect_sub_job.h @@ -47,7 +47,7 @@ class WebSocketTransportConnectSubJob scoped_ptr<StreamSocket> PassSocket() { return transport_socket_.Pass(); } // Implementation of WebSocketEndpointLockManager::EndpointWaiter. - virtual void GotEndpointLock() OVERRIDE; + virtual void GotEndpointLock() override; private: enum State { diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index 069f92e..7c4b50e 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -90,7 +90,7 @@ class SocketStreamEventRecorder : public SocketStream::Delegate { virtual int OnStartOpenConnection( SocketStream* socket, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { connection_callback_ = callback; events_.push_back( SocketStreamEvent(SocketStreamEvent::EVENT_START_OPEN_CONNECTION, @@ -100,7 +100,7 @@ class SocketStreamEventRecorder : public SocketStream::Delegate { return OK; } virtual void OnConnected(SocketStream* socket, - int num_pending_send_allowed) OVERRIDE { + int num_pending_send_allowed) override { events_.push_back( SocketStreamEvent(SocketStreamEvent::EVENT_CONNECTED, socket, num_pending_send_allowed, std::string(), @@ -109,7 +109,7 @@ class SocketStreamEventRecorder : public SocketStream::Delegate { on_connected_.Run(&events_.back()); } virtual void OnSentData(SocketStream* socket, - int amount_sent) OVERRIDE { + int amount_sent) override { events_.push_back( SocketStreamEvent(SocketStreamEvent::EVENT_SENT_DATA, socket, amount_sent, std::string(), NULL, OK)); @@ -117,14 +117,14 @@ class SocketStreamEventRecorder : public SocketStream::Delegate { on_sent_data_.Run(&events_.back()); } virtual void OnReceivedData(SocketStream* socket, - const char* data, int len) OVERRIDE { + const char* data, int len) override { events_.push_back( SocketStreamEvent(SocketStreamEvent::EVENT_RECEIVED_DATA, socket, len, std::string(data, len), NULL, OK)); if (!on_received_data_.is_null()) on_received_data_.Run(&events_.back()); } - virtual void OnClose(SocketStream* socket) OVERRIDE { + virtual void OnClose(SocketStream* socket) override { events_.push_back( SocketStreamEvent(SocketStreamEvent::EVENT_CLOSE, socket, 0, std::string(), NULL, OK)); @@ -134,14 +134,14 @@ class SocketStreamEventRecorder : public SocketStream::Delegate { callback_.Run(OK); } virtual void OnAuthRequired(SocketStream* socket, - AuthChallengeInfo* auth_info) OVERRIDE { + AuthChallengeInfo* auth_info) override { events_.push_back( SocketStreamEvent(SocketStreamEvent::EVENT_AUTH_REQUIRED, socket, 0, std::string(), auth_info, OK)); if (!on_auth_required_.is_null()) on_auth_required_.Run(&events_.back()); } - virtual void OnError(const SocketStream* socket, int error) OVERRIDE { + virtual void OnError(const SocketStream* socket, int error) override { events_.push_back( SocketStreamEvent(SocketStreamEvent::EVENT_ERROR, NULL, 0, std::string(), NULL, error)); @@ -198,7 +198,7 @@ class SelfDeletingDelegate : public SocketStream::Delegate { virtual ~SelfDeletingDelegate() {} // Call DetachDelegate(), delete |this|, then run the callback. - virtual void OnError(const SocketStream* socket, int error) OVERRIDE { + virtual void OnError(const SocketStream* socket, int error) override { // callback_ will be deleted when we delete |this|, so copy it to call it // afterwards. CompletionCallback callback = callback_; @@ -215,17 +215,17 @@ class SelfDeletingDelegate : public SocketStream::Delegate { } virtual void OnConnected(SocketStream* socket, int max_pending_send_allowed) - OVERRIDE { + override { ADD_FAILURE() << "OnConnected() should not be called"; } - virtual void OnSentData(SocketStream* socket, int amount_sent) OVERRIDE { + virtual void OnSentData(SocketStream* socket, int amount_sent) override { ADD_FAILURE() << "OnSentData() should not be called"; } virtual void OnReceivedData(SocketStream* socket, const char* data, int len) - OVERRIDE { + override { ADD_FAILURE() << "OnReceivedData() should not be called"; } - virtual void OnClose(SocketStream* socket) OVERRIDE { + virtual void OnClose(SocketStream* socket) override { ADD_FAILURE() << "OnClose() should not be called"; } @@ -254,7 +254,7 @@ class TestSocketStreamNetworkDelegate : public TestNetworkDelegate { virtual int OnBeforeSocketStreamConnect( SocketStream* stream, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return before_connect_result_; } diff --git a/net/spdy/buffered_spdy_framer.h b/net/spdy/buffered_spdy_framer.h index 426bc5f..fba98d7 100644 --- a/net/spdy/buffered_spdy_framer.h +++ b/net/spdy/buffered_spdy_framer.h @@ -135,41 +135,41 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer void set_debug_visitor(SpdyFramerDebugVisitorInterface* debug_visitor); // SpdyFramerVisitorInterface - virtual void OnError(SpdyFramer* spdy_framer) OVERRIDE; + virtual void OnError(SpdyFramer* spdy_framer) override; virtual void OnSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, - bool unidirectional) OVERRIDE; - virtual void OnSynReply(SpdyStreamId stream_id, bool fin) OVERRIDE; - virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) OVERRIDE; + bool unidirectional) override; + virtual void OnSynReply(SpdyStreamId stream_id, bool fin) override; + virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) override; virtual bool OnControlFrameHeaderData(SpdyStreamId stream_id, const char* header_data, - size_t len) OVERRIDE; + size_t len) override; virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE; - virtual void OnSettings(bool clear_persisted) OVERRIDE; + bool fin) override; + virtual void OnSettings(bool clear_persisted) override; virtual void OnSetting( - SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE; - virtual void OnSettingsAck() OVERRIDE; - virtual void OnSettingsEnd() OVERRIDE; - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE; + SpdySettingsIds id, uint8 flags, uint32 value) override; + virtual void OnSettingsAck() override; + virtual void OnSettingsEnd() override; + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override; virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE; + SpdyRstStreamStatus status) override; virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE; + SpdyGoAwayStatus status) override; virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE; + uint32 delta_window_size) override; virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - bool end) OVERRIDE; + bool end) override; virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE; - virtual void OnContinuation(SpdyStreamId stream_id, bool end) OVERRIDE; - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE; + bool fin) override; + virtual void OnContinuation(SpdyStreamId stream_id, bool end) override; + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override; // SpdyFramer methods. size_t ProcessInput(const char* data, size_t len); diff --git a/net/spdy/buffered_spdy_framer_unittest.cc b/net/spdy/buffered_spdy_framer_unittest.cc index 3e106f9e..0fc758b 100644 --- a/net/spdy/buffered_spdy_framer_unittest.cc +++ b/net/spdy/buffered_spdy_framer_unittest.cc @@ -25,14 +25,14 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { promised_stream_id_(static_cast<SpdyStreamId>(-1)) { } - virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE { + virtual void OnError(SpdyFramer::SpdyError error_code) override { LOG(INFO) << "SpdyFramer Error: " << error_code; error_count_++; } virtual void OnStreamError( SpdyStreamId stream_id, - const std::string& description) OVERRIDE { + const std::string& description) override { LOG(INFO) << "SpdyFramer Error on stream: " << stream_id << " " << description; error_count_++; @@ -43,7 +43,7 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { SpdyPriority priority, bool fin, bool unidirectional, - const SpdyHeaderBlock& headers) OVERRIDE { + const SpdyHeaderBlock& headers) override { header_stream_id_ = stream_id; EXPECT_NE(header_stream_id_, SpdyFramer::kInvalidStream); syn_frame_count_++; @@ -52,7 +52,7 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { virtual void OnSynReply(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE { + const SpdyHeaderBlock& headers) override { header_stream_id_ = stream_id; EXPECT_NE(header_stream_id_, SpdyFramer::kInvalidStream); syn_reply_frame_count_++; @@ -61,7 +61,7 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { virtual void OnHeaders(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE { + const SpdyHeaderBlock& headers) override { header_stream_id_ = stream_id; EXPECT_NE(header_stream_id_, SpdyFramer::kInvalidStream); headers_frame_count_++; @@ -70,33 +70,33 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE { + bool fin) override { ADD_FAILURE() << "Unexpected OnDataFrameHeader call."; } virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE { + bool fin) override { LOG(FATAL) << "Unexpected OnStreamFrameData call."; } - virtual void OnSettings(bool clear_persisted) OVERRIDE {} + virtual void OnSettings(bool clear_persisted) override {} virtual void OnSetting(SpdySettingsIds id, uint8 flags, - uint32 value) OVERRIDE { + uint32 value) override { setting_count_++; } - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE {} + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override {} virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE { + SpdyRstStreamStatus status) override { } virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE { + SpdyGoAwayStatus status) override { } bool OnCredentialFrameData(const char*, size_t) { @@ -112,11 +112,11 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { void OnGoAway(const SpdyFrame& frame) {} void OnPing(const SpdyFrame& frame) {} virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE {} + uint32 delta_window_size) override {} virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - const SpdyHeaderBlock& headers) OVERRIDE { + const SpdyHeaderBlock& headers) override { header_stream_id_ = stream_id; EXPECT_NE(header_stream_id_, SpdyFramer::kInvalidStream); push_promise_frame_count_++; @@ -125,7 +125,7 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface { headers_ = headers; } - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE { + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override { return true; } diff --git a/net/spdy/spdy_buffer_producer.h b/net/spdy/spdy_buffer_producer.h index fe82b1a..d8777af 100644 --- a/net/spdy/spdy_buffer_producer.h +++ b/net/spdy/spdy_buffer_producer.h @@ -37,7 +37,7 @@ class NET_EXPORT_PRIVATE SimpleBufferProducer : public SpdyBufferProducer { virtual ~SimpleBufferProducer(); - virtual scoped_ptr<SpdyBuffer> ProduceBuffer() OVERRIDE; + virtual scoped_ptr<SpdyBuffer> ProduceBuffer() override; private: scoped_ptr<SpdyBuffer> buffer_; diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index edcc82e..374506e 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.cc @@ -2847,49 +2847,49 @@ class FrameSerializationVisitor : public SpdyFrameVisitor { SpdySerializedFrame* ReleaseSerializedFrame() { return frame_.release(); } - virtual void VisitData(const SpdyDataIR& data) OVERRIDE { + virtual void VisitData(const SpdyDataIR& data) override { frame_.reset(framer_->SerializeData(data)); } - virtual void VisitSynStream(const SpdySynStreamIR& syn_stream) OVERRIDE { + virtual void VisitSynStream(const SpdySynStreamIR& syn_stream) override { frame_.reset(framer_->SerializeSynStream(syn_stream)); } - virtual void VisitSynReply(const SpdySynReplyIR& syn_reply) OVERRIDE { + virtual void VisitSynReply(const SpdySynReplyIR& syn_reply) override { frame_.reset(framer_->SerializeSynReply(syn_reply)); } - virtual void VisitRstStream(const SpdyRstStreamIR& rst_stream) OVERRIDE { + virtual void VisitRstStream(const SpdyRstStreamIR& rst_stream) override { frame_.reset(framer_->SerializeRstStream(rst_stream)); } - virtual void VisitSettings(const SpdySettingsIR& settings) OVERRIDE { + virtual void VisitSettings(const SpdySettingsIR& settings) override { frame_.reset(framer_->SerializeSettings(settings)); } - virtual void VisitPing(const SpdyPingIR& ping) OVERRIDE { + virtual void VisitPing(const SpdyPingIR& ping) override { frame_.reset(framer_->SerializePing(ping)); } - virtual void VisitGoAway(const SpdyGoAwayIR& goaway) OVERRIDE { + virtual void VisitGoAway(const SpdyGoAwayIR& goaway) override { frame_.reset(framer_->SerializeGoAway(goaway)); } - virtual void VisitHeaders(const SpdyHeadersIR& headers) OVERRIDE { + virtual void VisitHeaders(const SpdyHeadersIR& headers) override { frame_.reset(framer_->SerializeHeaders(headers)); } virtual void VisitWindowUpdate( - const SpdyWindowUpdateIR& window_update) OVERRIDE { + const SpdyWindowUpdateIR& window_update) override { frame_.reset(framer_->SerializeWindowUpdate(window_update)); } - virtual void VisitBlocked(const SpdyBlockedIR& blocked) OVERRIDE { + virtual void VisitBlocked(const SpdyBlockedIR& blocked) override { frame_.reset(framer_->SerializeBlocked(blocked)); } virtual void VisitPushPromise( - const SpdyPushPromiseIR& push_promise) OVERRIDE { + const SpdyPushPromiseIR& push_promise) override { frame_.reset(framer_->SerializePushPromise(push_promise)); } virtual void VisitContinuation( - const SpdyContinuationIR& continuation) OVERRIDE { + const SpdyContinuationIR& continuation) override { frame_.reset(framer_->SerializeContinuation(continuation)); } - virtual void VisitAltSvc(const SpdyAltSvcIR& altsvc) OVERRIDE { + virtual void VisitAltSvc(const SpdyAltSvcIR& altsvc) override { frame_.reset(framer_->SerializeAltSvc(altsvc)); } - virtual void VisitPriority(const SpdyPriorityIR& priority) OVERRIDE { + virtual void VisitPriority(const SpdyPriorityIR& priority) override { frame_.reset(framer_->SerializePriority(priority)); } diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc index 2676b4d..07b23ac 100644 --- a/net/spdy/spdy_framer_test.cc +++ b/net/spdy/spdy_framer_test.cc @@ -82,22 +82,22 @@ class SpdyFramerTestUtil { buffer_.reset(new char[kMaxDecompressedSize]); } - virtual void OnError(SpdyFramer* framer) OVERRIDE { LOG(FATAL); } + virtual void OnError(SpdyFramer* framer) override { LOG(FATAL); } virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE { + bool fin) override { LOG(FATAL) << "Unexpected data frame header"; } virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE { + bool fin) override { LOG(FATAL); } virtual bool OnControlFrameHeaderData(SpdyStreamId stream_id, const char* header_data, - size_t len) OVERRIDE { + size_t len) override { CHECK(buffer_.get() != NULL); CHECK_GE(kMaxDecompressedSize, size_ + len); CHECK(!finished_); @@ -115,7 +115,7 @@ class SpdyFramerTestUtil { SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, - bool unidirectional) OVERRIDE { + bool unidirectional) override { SpdyFramer framer(version_); framer.set_enable_compression(false); SpdySynStreamIR syn_stream(stream_id); @@ -129,7 +129,7 @@ class SpdyFramerTestUtil { size_ += framer.GetSynStreamMinimumSize(); } - virtual void OnSynReply(SpdyStreamId stream_id, bool fin) OVERRIDE { + virtual void OnSynReply(SpdyStreamId stream_id, bool fin) override { SpdyFramer framer(version_); framer.set_enable_compression(false); SpdyHeadersIR headers(stream_id); @@ -141,26 +141,26 @@ class SpdyFramerTestUtil { } virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE { + SpdyRstStreamStatus status) override { LOG(FATAL); } virtual void OnSetting(SpdySettingsIds id, uint8 flags, - uint32 value) OVERRIDE { + uint32 value) override { LOG(FATAL); } - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE { + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override { LOG(FATAL); } - virtual void OnSettingsEnd() OVERRIDE { LOG(FATAL); } + virtual void OnSettingsEnd() override { LOG(FATAL); } virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE { + SpdyGoAwayStatus status) override { LOG(FATAL); } virtual void OnHeaders(SpdyStreamId stream_id, bool fin, - bool end) OVERRIDE { + bool end) override { SpdyFramer framer(version_); framer.set_enable_compression(false); SpdyHeadersIR headers(stream_id); @@ -177,7 +177,7 @@ class SpdyFramerTestUtil { virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - bool end) OVERRIDE { + bool end) override { SpdyFramer framer(version_); framer.set_enable_compression(false); SpdyPushPromiseIR push_promise(stream_id, promised_stream_id); @@ -187,19 +187,19 @@ class SpdyFramerTestUtil { size_ += framer.GetPushPromiseMinimumSize(); } - virtual void OnContinuation(SpdyStreamId stream_id, bool end) OVERRIDE { + virtual void OnContinuation(SpdyStreamId stream_id, bool end) override { LOG(FATAL); } virtual void OnPriority(SpdyStreamId stream_id, SpdyStreamId parent_stream_id, uint8 weight, - bool exclusive) OVERRIDE { + bool exclusive) override { // Do nothing. } virtual bool OnUnknownFrame(SpdyStreamId stream_id, - int frame_type) OVERRIDE { + int frame_type) override { LOG(FATAL); return false; } @@ -210,7 +210,7 @@ class SpdyFramerTestUtil { } virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE { + uint32 delta_window_size) override { LOG(FATAL); } @@ -277,7 +277,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, header_control_type_(DATA), header_buffer_valid_(false) {} - virtual void OnError(SpdyFramer* f) OVERRIDE { + virtual void OnError(SpdyFramer* f) override { LOG(INFO) << "SpdyFramer Error: " << SpdyFramer::ErrorCodeToString(f->error_code()); ++error_count_; @@ -285,7 +285,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE { + bool fin) override { ++data_frame_count_; header_stream_id_ = stream_id; } @@ -293,7 +293,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE { + bool fin) override { EXPECT_EQ(header_stream_id_, stream_id); if (len == 0) ++zero_length_data_frame_count_; @@ -310,7 +310,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, virtual bool OnControlFrameHeaderData(SpdyStreamId stream_id, const char* header_data, - size_t len) OVERRIDE { + size_t len) override { ++control_frame_header_data_count_; CHECK_EQ(header_stream_id_, stream_id); if (len == 0) { @@ -339,7 +339,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, - bool unidirectional) OVERRIDE { + bool unidirectional) override { ++syn_frame_count_; if (framer_.protocol_version() > SPDY3) { InitHeaderStreaming(HEADERS, stream_id); @@ -351,7 +351,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, } } - virtual void OnSynReply(SpdyStreamId stream_id, bool fin) OVERRIDE { + virtual void OnSynReply(SpdyStreamId stream_id, bool fin) override { ++syn_reply_frame_count_; if (framer_.protocol_version() > SPDY3) { InitHeaderStreaming(HEADERS, stream_id); @@ -364,12 +364,12 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, } virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE { + SpdyRstStreamStatus status) override { ++fin_frame_count_; } virtual bool OnRstStreamFrameData(const char* rst_stream_data, - size_t len) OVERRIDE { + size_t len) override { if ((rst_stream_data != NULL) && (len > 0)) { fin_opaque_data_ += std::string(rst_stream_data, len); } @@ -378,30 +378,30 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, virtual void OnSetting(SpdySettingsIds id, uint8 flags, - uint32 value) OVERRIDE { + uint32 value) override { ++setting_count_; } - virtual void OnSettingsAck() OVERRIDE { + virtual void OnSettingsAck() override { DCHECK_LT(SPDY3, framer_.protocol_version()); ++settings_ack_received_; } - virtual void OnSettingsEnd() OVERRIDE { + virtual void OnSettingsEnd() override { if (framer_.protocol_version() <= SPDY3) { return; } ++settings_ack_sent_; } - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE { + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override { DLOG(FATAL); } virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE { + SpdyGoAwayStatus status) override { ++goaway_count_; } - virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) OVERRIDE { + virtual void OnHeaders(SpdyStreamId stream_id, bool fin, bool end) override { ++headers_frame_count_; InitHeaderStreaming(HEADERS, stream_id); if (fin) { @@ -410,21 +410,21 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, } virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE { + uint32 delta_window_size) override { last_window_update_stream_ = stream_id; last_window_update_delta_ = delta_window_size; } virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - bool end) OVERRIDE { + bool end) override { ++push_promise_frame_count_; InitHeaderStreaming(PUSH_PROMISE, stream_id); last_push_promise_stream_ = stream_id; last_push_promise_promised_stream_ = promised_stream_id; } - virtual void OnContinuation(SpdyStreamId stream_id, bool end) OVERRIDE { + virtual void OnContinuation(SpdyStreamId stream_id, bool end) override { ++continuation_count_; } @@ -433,7 +433,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, uint16 port, StringPiece protocol_id, StringPiece host, - StringPiece origin) OVERRIDE { + StringPiece origin) override { test_altsvc_ir_.set_stream_id(stream_id); test_altsvc_ir_.set_max_age(max_age); test_altsvc_ir_.set_port(port); @@ -448,11 +448,11 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, virtual void OnPriority(SpdyStreamId stream_id, SpdyStreamId parent_stream_id, uint8 weight, - bool exclusive) OVERRIDE { + bool exclusive) override { ++priority_count_; } - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE { + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override { DLOG(INFO) << "Unknown frame type " << frame_type; return on_unknown_frame_result_; } @@ -460,14 +460,14 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface, virtual void OnSendCompressedFrame(SpdyStreamId stream_id, SpdyFrameType type, size_t payload_len, - size_t frame_len) OVERRIDE { + size_t frame_len) override { last_payload_len_ = payload_len; last_frame_len_ = frame_len; } virtual void OnReceiveCompressedFrame(SpdyStreamId stream_id, SpdyFrameType type, - size_t frame_len) OVERRIDE { + size_t frame_len) override { last_frame_len_ = frame_len; } diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h index 0f37c66..fe3c87d 100644 --- a/net/spdy/spdy_http_stream.h +++ b/net/spdy/spdy_http_stream.h @@ -44,44 +44,44 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate, virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int SendRequest(const HttpRequestHeaders& headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE; - virtual UploadProgress GetUploadProgress() const OVERRIDE; - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual UploadProgress GetUploadProgress() const override; + virtual int ReadResponseHeaders(const CompletionCallback& callback) override; virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void Close(bool not_reusable) OVERRIDE; - virtual HttpStream* RenewStreamForAuth() OVERRIDE; - virtual bool IsResponseBodyComplete() const OVERRIDE; - virtual bool CanFindEndOfResponse() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Close(bool not_reusable) override; + virtual HttpStream* RenewStreamForAuth() override; + virtual bool IsResponseBodyComplete() const override; + virtual bool CanFindEndOfResponse() const override; // Must not be called if a NULL SpdySession was pssed into the // constructor. - virtual bool IsConnectionReused() const OVERRIDE; + virtual bool IsConnectionReused() const override; - virtual void SetConnectionReused() OVERRIDE; - virtual bool IsConnectionReusable() const OVERRIDE; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; + virtual void SetConnectionReused() override; + virtual bool IsConnectionReusable() const override; + virtual int64 GetTotalReceivedBytes() const override; virtual bool GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual void GetSSLInfo(SSLInfo* ssl_info) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual bool IsSpdyHttpStream() const OVERRIDE; - virtual void Drain(HttpNetworkSession* session) OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual bool IsSpdyHttpStream() const override; + virtual void Drain(HttpNetworkSession* session) override; + virtual void SetPriority(RequestPriority priority) override; // SpdyStream::Delegate implementation. - virtual void OnRequestHeadersSent() OVERRIDE; + virtual void OnRequestHeadersSent() override; virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; - virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE; - virtual void OnDataSent() OVERRIDE; - virtual void OnClose(int status) OVERRIDE; + const SpdyHeaderBlock& response_headers) override; + virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) override; + virtual void OnDataSent() override; + virtual void OnClose(int status) override; private: // Must be called only when |request_info_| is non-NULL. diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc index f51133f..2f03f40 100644 --- a/net/spdy/spdy_http_stream_unittest.cc +++ b/net/spdy/spdy_http_stream_unittest.cc @@ -79,7 +79,7 @@ class SpdyHttpStreamTest : public testing::Test, OrderedSocketData* data() { return data_.get(); } protected: - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { crypto::ECSignatureCreator::SetFactoryForTesting(NULL); base::MessageLoop::current()->RunUntilIdle(); } diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h index 296ff0a..cb9bdfe 100644 --- a/net/spdy/spdy_protocol.h +++ b/net/spdy/spdy_protocol.h @@ -663,7 +663,7 @@ class NET_EXPORT_PRIVATE SpdyDataIR data_ = data; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: // Used to store data that this SpdyDataIR should own. @@ -698,7 +698,7 @@ class NET_EXPORT_PRIVATE SpdySynStreamIR unidirectional_ = unidirectional; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: SpdyStreamId associated_to_stream_id_; @@ -713,7 +713,7 @@ class NET_EXPORT_PRIVATE SpdySynReplyIR : public SpdyFrameWithNameValueBlockIR { explicit SpdySynReplyIR(SpdyStreamId stream_id) : SpdyFrameWithNameValueBlockIR(stream_id) {} - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: DISALLOW_COPY_AND_ASSIGN(SpdySynReplyIR); @@ -739,7 +739,7 @@ class NET_EXPORT_PRIVATE SpdyRstStreamIR : public SpdyFrameWithStreamIdIR { description_ = description; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: SpdyRstStreamStatus status_; @@ -785,7 +785,7 @@ class NET_EXPORT_PRIVATE SpdySettingsIR : public SpdyFrameIR { is_ack_ = is_ack; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: ValueMap values_; @@ -804,7 +804,7 @@ class NET_EXPORT_PRIVATE SpdyPingIR : public SpdyFrameIR { bool is_ack() const { return is_ack_; } void set_is_ack(bool is_ack) { is_ack_ = is_ack; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: SpdyPingId id_; @@ -832,7 +832,7 @@ class NET_EXPORT_PRIVATE SpdyGoAwayIR : public SpdyFrameIR { const base::StringPiece& description() const; - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: SpdyStreamId last_good_stream_id_; @@ -849,7 +849,7 @@ class NET_EXPORT_PRIVATE SpdyHeadersIR : public SpdyFrameWithNameValueBlockIR { has_priority_(false), priority_(0) {} - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; bool has_priority() const { return has_priority_; } void set_has_priority(bool has_priority) { has_priority_ = has_priority; } @@ -876,7 +876,7 @@ class NET_EXPORT_PRIVATE SpdyWindowUpdateIR : public SpdyFrameWithStreamIdIR { delta_ = delta; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: int32 delta_; @@ -890,7 +890,7 @@ class NET_EXPORT_PRIVATE SpdyBlockedIR explicit SpdyBlockedIR(SpdyStreamId stream_id) : SpdyFrameWithStreamIdIR(stream_id) {} - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: DISALLOW_COPY_AND_ASSIGN(SpdyBlockedIR); @@ -905,7 +905,7 @@ class NET_EXPORT_PRIVATE SpdyPushPromiseIR SpdyStreamId promised_stream_id() const { return promised_stream_id_; } void set_promised_stream_id(SpdyStreamId id) { promised_stream_id_ = id; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: SpdyStreamId promised_stream_id_; @@ -921,7 +921,7 @@ class NET_EXPORT_PRIVATE SpdyContinuationIR : SpdyFrameWithNameValueBlockIR(stream_id), end_headers_(false) {} - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; bool end_headers() const { return end_headers_; } void set_end_headers(bool end_headers) {end_headers_ = end_headers;} @@ -955,7 +955,7 @@ class NET_EXPORT_PRIVATE SpdyAltSvcIR : public SpdyFrameWithStreamIdIR { origin_ = origin; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: uint32 max_age_; @@ -980,7 +980,7 @@ class NET_EXPORT_PRIVATE SpdyPriorityIR : public SpdyFrameWithStreamIdIR { bool exclusive() const { return exclusive_; } void set_exclusive(bool exclusive) { exclusive_ = exclusive; } - virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; + virtual void Visit(SpdyFrameVisitor* visitor) const override; private: SpdyStreamId parent_stream_id_; diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h index 7a293a0..3b0736c 100644 --- a/net/spdy/spdy_proxy_client_socket.h +++ b/net/spdy/spdy_proxy_client_socket.h @@ -57,47 +57,47 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket, virtual ~SpdyProxyClientSocket(); // ProxyClientSocket methods: - virtual const HttpResponseInfo* GetConnectResponseInfo() const OVERRIDE; - virtual HttpStream* CreateConnectResponseStream() OVERRIDE; + virtual const HttpResponseInfo* GetConnectResponseInfo() const override; + virtual HttpStream* CreateConnectResponseStream() override; virtual const scoped_refptr<HttpAuthController>& GetAuthController() const - OVERRIDE; - virtual int RestartWithAuth(const CompletionCallback& callback) OVERRIDE; - virtual bool IsUsingSpdy() const OVERRIDE; - virtual NextProto GetProtocolNegotiated() const OVERRIDE; + override; + virtual int RestartWithAuth(const CompletionCallback& callback) override; + virtual bool IsUsingSpdy() const override; + virtual NextProto GetProtocolNegotiated() const override; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& callback) OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual bool IsConnected() const OVERRIDE; - virtual bool IsConnectedAndIdle() const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void SetSubresourceSpeculation() OVERRIDE; - virtual void SetOmniboxSpeculation() OVERRIDE; - virtual bool WasEverUsed() const OVERRIDE; - virtual bool UsingTCPFastOpen() const OVERRIDE; - virtual bool WasNpnNegotiated() const OVERRIDE; - virtual NextProto GetNegotiatedProtocol() const OVERRIDE; - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) override; + virtual void Disconnect() override; + virtual bool IsConnected() const override; + virtual bool IsConnectedAndIdle() const override; + virtual const BoundNetLog& NetLog() const override; + virtual void SetSubresourceSpeculation() override; + virtual void SetOmniboxSpeculation() override; + virtual bool WasEverUsed() const override; + virtual bool UsingTCPFastOpen() const override; + virtual bool WasNpnNegotiated() const override; + virtual NextProto GetNegotiatedProtocol() const override; + virtual bool GetSSLInfo(SSLInfo* ssl_info) override; // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; // SpdyStream::Delegate implementation. - virtual void OnRequestHeadersSent() OVERRIDE; + virtual void OnRequestHeadersSent() override; virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; - virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE; - virtual void OnDataSent() OVERRIDE; - virtual void OnClose(int status) OVERRIDE; + const SpdyHeaderBlock& response_headers) override; + virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) override; + virtual void OnDataSent() override; + virtual void OnClose(int status) override; private: enum State { diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index 519d07b..293ed2b 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -517,7 +517,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface, base::WeakPtr<SpdySession> GetWeakPtr(); // HigherLayeredPool implementation: - virtual bool CloseOneIdleConnection() OVERRIDE; + virtual bool CloseOneIdleConnection() override; private: friend class base::RefCounted<SpdySession>; @@ -813,55 +813,55 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface, void DeleteExpiredPushedStreams(); // BufferedSpdyFramerVisitorInterface: - virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE; + virtual void OnError(SpdyFramer::SpdyError error_code) override; virtual void OnStreamError(SpdyStreamId stream_id, - const std::string& description) OVERRIDE; - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE; + const std::string& description) override; + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override; virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE; + SpdyRstStreamStatus status) override; virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE; + SpdyGoAwayStatus status) override; virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE; + bool fin) override; virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE; - virtual void OnSettings(bool clear_persisted) OVERRIDE; + bool fin) override; + virtual void OnSettings(bool clear_persisted) override; virtual void OnSetting( - SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE; + SpdySettingsIds id, uint8 flags, uint32 value) override; virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE; + uint32 delta_window_size) override; virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; virtual void OnSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, bool unidirectional, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; virtual void OnSynReply( SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; virtual void OnHeaders( SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE; - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE; + const SpdyHeaderBlock& headers) override; + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override; // SpdyFramerDebugVisitorInterface virtual void OnSendCompressedFrame( SpdyStreamId stream_id, SpdyFrameType type, size_t payload_len, - size_t frame_len) OVERRIDE; + size_t frame_len) override; virtual void OnReceiveCompressedFrame( SpdyStreamId stream_id, SpdyFrameType type, - size_t frame_len) OVERRIDE; + size_t frame_len) override; // Called when bytes are consumed from a SpdyBuffer for a DATA frame // that is to be written or is being written. Increases the send diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h index 2fbb030..de2ddfa 100644 --- a/net/spdy/spdy_session_pool.h +++ b/net/spdy/spdy_session_pool.h @@ -133,19 +133,19 @@ class NET_EXPORT SpdySessionPool // We flush all idle sessions and release references to the active ones so // they won't get re-used. The active ones will either complete successfully // or error out due to the IP address change. - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; // SSLConfigService::Observer methods: // We perform the same flushing as described above when SSL settings change. - virtual void OnSSLConfigChanged() OVERRIDE; + virtual void OnSSLConfigChanged() override; // CertDatabase::Observer methods: // We perform the same flushing as described above when certificate database // is changed. - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE; - virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE; + virtual void OnCertAdded(const X509Certificate* cert) override; + virtual void OnCACertChanged(const X509Certificate* cert) override; private: friend class SpdySessionPoolPeer; // For testing. diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc index 16a624b..ece5d34 100644 --- a/net/spdy/spdy_session_pool_unittest.cc +++ b/net/spdy/spdy_session_pool_unittest.cc @@ -64,18 +64,18 @@ class SessionOpeningDelegate : public SpdyStream::Delegate { virtual ~SessionOpeningDelegate() {} - virtual void OnRequestHeadersSent() OVERRIDE {} + virtual void OnRequestHeadersSent() override {} virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE { + const SpdyHeaderBlock& response_headers) override { return RESPONSE_HEADERS_ARE_COMPLETE; } - virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE {} + virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) override {} - virtual void OnDataSent() OVERRIDE {} + virtual void OnDataSent() override {} - virtual void OnClose(int status) OVERRIDE { + virtual void OnClose(int status) override { ignore_result(CreateFakeSpdySession(spdy_session_pool_, key_)); } diff --git a/net/spdy/spdy_session_test_util.h b/net/spdy/spdy_session_test_util.h index 08a82ee..cc3f136 100644 --- a/net/spdy/spdy_session_test_util.h +++ b/net/spdy/spdy_session_test_util.h @@ -29,8 +29,8 @@ class SpdySessionTestTaskObserver : public base::MessageLoop::TaskObserver { virtual ~SpdySessionTestTaskObserver(); // Implements MessageLoop::TaskObserver. - virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE; - virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE; + virtual void WillProcessTask(const base::PendingTask& pending_task) override; + virtual void DidProcessTask(const base::PendingTask& pending_task) override; // Returns the number of tasks posted by the given function and file. uint16 executed_count() const { return executed_count_; } diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc index 938f6e5..f4136bd 100644 --- a/net/spdy/spdy_session_unittest.cc +++ b/net/spdy/spdy_session_unittest.cc @@ -121,7 +121,7 @@ class SpdySessionTest : public PlatformTest, HttpNetworkSession::NORMAL_SOCKET_POOL, old_max_group_sockets_); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { g_time_delta = base::TimeDelta(); } @@ -2305,7 +2305,7 @@ class SessionClosingDelegate : public test::StreamDelegateDoNothing { virtual ~SessionClosingDelegate() {} - virtual void OnClose(int status) OVERRIDE { + virtual void OnClose(int status) override { session_to_close_->CloseSessionOnError(ERR_SPDY_PROTOCOL_ERROR, "Error"); } @@ -3381,7 +3381,7 @@ class StreamCreatingDelegate : public test::StreamDelegateDoNothing { virtual ~StreamCreatingDelegate() {} - virtual void OnClose(int status) OVERRIDE { + virtual void OnClose(int status) override { GURL url(kDefaultURL); ignore_result( CreateStreamSynchronously(SPDY_REQUEST_RESPONSE_STREAM, @@ -3661,7 +3661,7 @@ class DropReceivedDataDelegate : public test::StreamDelegateSendImmediate { virtual ~DropReceivedDataDelegate() {} // Drop any received data. - virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE {} + virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) override {} }; // Send data back and forth but use a delegate that drops its received @@ -4249,7 +4249,7 @@ class StreamClosingDelegate : public test::StreamDelegateWithBody { stream_to_close_ = stream_to_close; } - virtual void OnDataSent() OVERRIDE { + virtual void OnDataSent() override { test::StreamDelegateWithBody::OnDataSent(); if (stream_to_close_.get()) { stream_to_close_->Close(); diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc index 3a0d988..6de0a39 100644 --- a/net/spdy/spdy_stream.cc +++ b/net/spdy/spdy_stream.cc @@ -63,7 +63,7 @@ class SpdyStream::SynStreamBufferProducer : public SpdyBufferProducer { virtual ~SynStreamBufferProducer() {} - virtual scoped_ptr<SpdyBuffer> ProduceBuffer() OVERRIDE { + virtual scoped_ptr<SpdyBuffer> ProduceBuffer() override { if (!stream_.get()) { NOTREACHED(); return scoped_ptr<SpdyBuffer>(); diff --git a/net/spdy/spdy_stream_test_util.h b/net/spdy/spdy_stream_test_util.h index 0c0497e..7df12e8 100644 --- a/net/spdy/spdy_stream_test_util.h +++ b/net/spdy/spdy_stream_test_util.h @@ -26,12 +26,12 @@ class ClosingDelegate : public SpdyStream::Delegate { virtual ~ClosingDelegate(); // SpdyStream::Delegate implementation. - virtual void OnRequestHeadersSent() OVERRIDE; + virtual void OnRequestHeadersSent() override; virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; - virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE; - virtual void OnDataSent() OVERRIDE; - virtual void OnClose(int status) OVERRIDE; + const SpdyHeaderBlock& response_headers) override; + virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) override; + virtual void OnDataSent() override; + virtual void OnClose(int status) override; // Returns whether or not the stream is closed. bool StreamIsClosed() const { return !stream_.get(); } @@ -47,12 +47,12 @@ class StreamDelegateBase : public SpdyStream::Delegate { explicit StreamDelegateBase(const base::WeakPtr<SpdyStream>& stream); virtual ~StreamDelegateBase(); - virtual void OnRequestHeadersSent() OVERRIDE; + virtual void OnRequestHeadersSent() override; virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; - virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE; - virtual void OnDataSent() OVERRIDE; - virtual void OnClose(int status) OVERRIDE; + const SpdyHeaderBlock& response_headers) override; + virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) override; + virtual void OnDataSent() override; + virtual void OnClose(int status) override; // Waits for the stream to be closed and returns the status passed // to OnClose(). @@ -101,7 +101,7 @@ class StreamDelegateSendImmediate : public StreamDelegateBase { virtual ~StreamDelegateSendImmediate(); virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; + const SpdyHeaderBlock& response_headers) override; private: base::StringPiece data_; @@ -114,7 +114,7 @@ class StreamDelegateWithBody : public StreamDelegateBase { base::StringPiece data); virtual ~StreamDelegateWithBody(); - virtual void OnRequestHeadersSent() OVERRIDE; + virtual void OnRequestHeadersSent() override; private: scoped_refptr<StringIOBuffer> buf_; @@ -127,7 +127,7 @@ class StreamDelegateCloseOnHeaders : public StreamDelegateBase { virtual ~StreamDelegateCloseOnHeaders(); virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; + const SpdyHeaderBlock& response_headers) override; }; } // namespace test diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc index 5de58d6..2e1aba5 100644 --- a/net/spdy/spdy_test_util_common.cc +++ b/net/spdy/spdy_test_util_common.cc @@ -214,44 +214,44 @@ class PriorityGetter : public BufferedSpdyFramerVisitorInterface { return priority_; } - virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE {} + virtual void OnError(SpdyFramer::SpdyError error_code) override {} virtual void OnStreamError(SpdyStreamId stream_id, - const std::string& description) OVERRIDE {} + const std::string& description) override {} virtual void OnSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, bool unidirectional, - const SpdyHeaderBlock& headers) OVERRIDE { + const SpdyHeaderBlock& headers) override { priority_ = priority; } virtual void OnSynReply(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE {} + const SpdyHeaderBlock& headers) override {} virtual void OnHeaders(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE {} + const SpdyHeaderBlock& headers) override {} virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE {} + bool fin) override {} virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE {} - virtual void OnSettings(bool clear_persisted) OVERRIDE {} + bool fin) override {} + virtual void OnSettings(bool clear_persisted) override {} virtual void OnSetting( - SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE {} - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE {} + SpdySettingsIds id, uint8 flags, uint32 value) override {} + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override {} virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE {} + SpdyRstStreamStatus status) override {} virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE {} + SpdyGoAwayStatus status) override {} virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE {} + uint32 delta_window_size) override {} virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - const SpdyHeaderBlock& headers) OVERRIDE {} - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE { + const SpdyHeaderBlock& headers) override {} + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override { return false; } @@ -616,43 +616,43 @@ class FakeSpdySessionClientSocket : public MockClientSocket { virtual ~FakeSpdySessionClientSocket() {} virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return read_result_; } virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } // Return kProtoUnknown to use the pool's default protocol. - virtual NextProto GetNegotiatedProtocol() const OVERRIDE { + virtual NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } // The functions below are not expected to be called. - virtual int Connect(const CompletionCallback& callback) OVERRIDE { + virtual int Connect(const CompletionCallback& callback) override { ADD_FAILURE(); return ERR_UNEXPECTED; } - virtual bool WasEverUsed() const OVERRIDE { + virtual bool WasEverUsed() const override { ADD_FAILURE(); return false; } - virtual bool UsingTCPFastOpen() const OVERRIDE { + virtual bool UsingTCPFastOpen() const override { ADD_FAILURE(); return false; } - virtual bool WasNpnNegotiated() const OVERRIDE { + virtual bool WasNpnNegotiated() const override { ADD_FAILURE(); return false; } - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE { + virtual bool GetSSLInfo(SSLInfo* ssl_info) override { ADD_FAILURE(); return false; } diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h index 108e278..897f670 100644 --- a/net/spdy/spdy_test_util_common.h +++ b/net/spdy/spdy_test_util_common.h @@ -159,9 +159,9 @@ class MockECSignatureCreator : public crypto::ECSignatureCreator { // crypto::ECSignatureCreator virtual bool Sign(const uint8* data, int data_len, - std::vector<uint8>* signature) OVERRIDE; + std::vector<uint8>* signature) override; virtual bool DecodeSignature(const std::vector<uint8>& signature, - std::vector<uint8>* out_raw_sig) OVERRIDE; + std::vector<uint8>* out_raw_sig) override; private: crypto::ECPrivateKey* key_; @@ -177,7 +177,7 @@ class MockECSignatureCreatorFactory : public crypto::ECSignatureCreatorFactory { // crypto::ECSignatureCreatorFactory virtual crypto::ECSignatureCreator* Create( - crypto::ECPrivateKey* key) OVERRIDE; + crypto::ECPrivateKey* key) override; private: DISALLOW_COPY_AND_ASSIGN(MockECSignatureCreatorFactory); diff --git a/net/spdy/spdy_websocket_stream.h b/net/spdy/spdy_websocket_stream.h index 6998134..66a89e8 100644 --- a/net/spdy/spdy_websocket_stream.h +++ b/net/spdy/spdy_websocket_stream.h @@ -75,12 +75,12 @@ class NET_EXPORT_PRIVATE SpdyWebSocketStream void Close(); // SpdyStream::Delegate - virtual void OnRequestHeadersSent() OVERRIDE; + virtual void OnRequestHeadersSent() override; virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; - virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE; - virtual void OnDataSent() OVERRIDE; - virtual void OnClose(int status) OVERRIDE; + const SpdyHeaderBlock& response_headers) override; + virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) override; + virtual void OnDataSent() override; + virtual void OnClose(int status) override; private: friend class SpdyWebSocketStreamTest; diff --git a/net/spdy/spdy_websocket_stream_unittest.cc b/net/spdy/spdy_websocket_stream_unittest.cc index 5720675..5941bdf 100644 --- a/net/spdy/spdy_websocket_stream_unittest.cc +++ b/net/spdy/spdy_websocket_stream_unittest.cc @@ -74,7 +74,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate { on_close_ = callback; } - virtual void OnCreatedSpdyStream(int result) OVERRIDE { + virtual void OnCreatedSpdyStream(int result) override { events_.push_back( SpdyWebSocketStreamEvent(SpdyWebSocketStreamEvent::EVENT_CREATED, SpdyHeaderBlock(), @@ -83,7 +83,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate { if (!on_created_.is_null()) on_created_.Run(&events_.back()); } - virtual void OnSentSpdyHeaders() OVERRIDE { + virtual void OnSentSpdyHeaders() override { events_.push_back( SpdyWebSocketStreamEvent(SpdyWebSocketStreamEvent::EVENT_SENT_HEADERS, SpdyHeaderBlock(), @@ -93,7 +93,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate { on_sent_data_.Run(&events_.back()); } virtual void OnSpdyResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE { + const SpdyHeaderBlock& response_headers) override { events_.push_back( SpdyWebSocketStreamEvent( SpdyWebSocketStreamEvent::EVENT_RECEIVED_HEADER, @@ -103,7 +103,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate { if (!on_received_header_.is_null()) on_received_header_.Run(&events_.back()); } - virtual void OnSentSpdyData(size_t bytes_sent) OVERRIDE { + virtual void OnSentSpdyData(size_t bytes_sent) override { events_.push_back( SpdyWebSocketStreamEvent( SpdyWebSocketStreamEvent::EVENT_SENT_DATA, @@ -113,7 +113,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate { if (!on_sent_data_.is_null()) on_sent_data_.Run(&events_.back()); } - virtual void OnReceivedSpdyData(scoped_ptr<SpdyBuffer> buffer) OVERRIDE { + virtual void OnReceivedSpdyData(scoped_ptr<SpdyBuffer> buffer) override { std::string buffer_data; size_t buffer_len = 0; if (buffer) { @@ -129,7 +129,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate { if (!on_received_data_.is_null()) on_received_data_.Run(&events_.back()); } - virtual void OnCloseSpdyStream() OVERRIDE { + virtual void OnCloseSpdyStream() override { events_.push_back( SpdyWebSocketStreamEvent( SpdyWebSocketStreamEvent::EVENT_CLOSE, diff --git a/net/spdy/spdy_write_queue_unittest.cc b/net/spdy/spdy_write_queue_unittest.cc index 2ab415a..cb24d12 100644 --- a/net/spdy/spdy_write_queue_unittest.cc +++ b/net/spdy/spdy_write_queue_unittest.cc @@ -59,7 +59,7 @@ class RequeingBufferProducer : public SpdyBufferProducer { base::Bind(RequeingBufferProducer::ConsumeCallback, queue)); } - virtual scoped_ptr<SpdyBuffer> ProduceBuffer() OVERRIDE { + virtual scoped_ptr<SpdyBuffer> ProduceBuffer() override { return buffer_.Pass(); } diff --git a/net/ssl/channel_id_service_unittest.cc b/net/ssl/channel_id_service_unittest.cc index e5f084d..52083e8 100644 --- a/net/ssl/channel_id_service_unittest.cc +++ b/net/ssl/channel_id_service_unittest.cc @@ -37,11 +37,11 @@ class FailingTaskRunner : public base::TaskRunner { virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { return false; } - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { return true; } + virtual bool RunsTasksOnCurrentThread() const override { return true; } protected: virtual ~FailingTaskRunner() {} @@ -60,17 +60,17 @@ class MockChannelIDStoreWithAsyncGet base::Time* expiration_time, std::string* private_key_result, std::string* cert_result, - const GetChannelIDCallback& callback) OVERRIDE; + const GetChannelIDCallback& callback) override; virtual void SetChannelID(const std::string& server_identifier, base::Time creation_time, base::Time expiration_time, const std::string& private_key, - const std::string& cert) OVERRIDE { + const std::string& cert) override { channel_id_count_ = 1; } - virtual int GetChannelIDCount() OVERRIDE { return channel_id_count_; } + virtual int GetChannelIDCount() override { return channel_id_count_; } void CallGetChannelIDCallbackWithResult(int err, base::Time expiration_time, diff --git a/net/ssl/client_cert_store_chromeos.h b/net/ssl/client_cert_store_chromeos.h index 940888d..f14619a 100644 --- a/net/ssl/client_cert_store_chromeos.h +++ b/net/ssl/client_cert_store_chromeos.h @@ -27,14 +27,14 @@ class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS { // ClientCertStoreNSS: virtual void GetClientCerts(const SSLCertRequestInfo& cert_request_info, CertificateList* selected_certs, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; protected: // ClientCertStoreNSS: virtual void GetClientCertsImpl(CERTCertList* cert_list, const SSLCertRequestInfo& request, bool query_nssdb, - CertificateList* selected_certs) OVERRIDE; + CertificateList* selected_certs) override; private: void DidGetSystemAndPrivateSlot(const SSLCertRequestInfo* request, diff --git a/net/ssl/client_cert_store_mac.h b/net/ssl/client_cert_store_mac.h index b3f7ef3..5c697db 100644 --- a/net/ssl/client_cert_store_mac.h +++ b/net/ssl/client_cert_store_mac.h @@ -22,7 +22,7 @@ class NET_EXPORT ClientCertStoreMac : public ClientCertStore { // ClientCertStore: virtual void GetClientCerts(const SSLCertRequestInfo& cert_request_info, CertificateList* selected_certs, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; private: friend class ClientCertStoreMacTest; diff --git a/net/ssl/client_cert_store_nss.h b/net/ssl/client_cert_store_nss.h index 4e2e1c4..38895aa 100644 --- a/net/ssl/client_cert_store_nss.h +++ b/net/ssl/client_cert_store_nss.h @@ -32,7 +32,7 @@ class NET_EXPORT ClientCertStoreNSS : public ClientCertStore { // ClientCertStore: virtual void GetClientCerts(const SSLCertRequestInfo& cert_request_info, CertificateList* selected_certs, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; protected: // Examines the certificates in |cert_list| to find all certificates that diff --git a/net/ssl/client_cert_store_win.h b/net/ssl/client_cert_store_win.h index 785603d..567c267 100644 --- a/net/ssl/client_cert_store_win.h +++ b/net/ssl/client_cert_store_win.h @@ -22,7 +22,7 @@ class NET_EXPORT ClientCertStoreWin : public ClientCertStore { // ClientCertStore: virtual void GetClientCerts(const SSLCertRequestInfo& cert_request_info, CertificateList* selected_certs, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; private: friend class ClientCertStoreWinTestDelegate; diff --git a/net/ssl/default_channel_id_store.cc b/net/ssl/default_channel_id_store.cc index 1dec6c1..4f43fbc 100644 --- a/net/ssl/default_channel_id_store.cc +++ b/net/ssl/default_channel_id_store.cc @@ -42,7 +42,7 @@ class DefaultChannelIDStore::GetChannelIDTask GetChannelIDTask(const std::string& server_identifier, const GetChannelIDCallback& callback); virtual ~GetChannelIDTask(); - virtual void Run(DefaultChannelIDStore* store) OVERRIDE; + virtual void Run(DefaultChannelIDStore* store) override; private: std::string server_identifier_; @@ -84,7 +84,7 @@ class DefaultChannelIDStore::SetChannelIDTask const std::string& private_key, const std::string& cert); virtual ~SetChannelIDTask(); - virtual void Run(DefaultChannelIDStore* store) OVERRIDE; + virtual void Run(DefaultChannelIDStore* store) override; private: std::string server_identifier_; @@ -124,7 +124,7 @@ class DefaultChannelIDStore::DeleteChannelIDTask DeleteChannelIDTask(const std::string& server_identifier, const base::Closure& callback); virtual ~DeleteChannelIDTask(); - virtual void Run(DefaultChannelIDStore* store) OVERRIDE; + virtual void Run(DefaultChannelIDStore* store) override; private: std::string server_identifier_; @@ -159,7 +159,7 @@ class DefaultChannelIDStore::DeleteAllCreatedBetweenTask base::Time delete_end, const base::Closure& callback); virtual ~DeleteAllCreatedBetweenTask(); - virtual void Run(DefaultChannelIDStore* store) OVERRIDE; + virtual void Run(DefaultChannelIDStore* store) override; private: base::Time delete_begin_; @@ -195,7 +195,7 @@ class DefaultChannelIDStore::GetAllChannelIDsTask public: explicit GetAllChannelIDsTask(const GetChannelIDListCallback& callback); virtual ~GetAllChannelIDsTask(); - virtual void Run(DefaultChannelIDStore* store) OVERRIDE; + virtual void Run(DefaultChannelIDStore* store) override; private: std::string server_identifier_; diff --git a/net/ssl/default_channel_id_store.h b/net/ssl/default_channel_id_store.h index 9c307e8..3882c1f 100644 --- a/net/ssl/default_channel_id_store.h +++ b/net/ssl/default_channel_id_store.h @@ -49,25 +49,25 @@ class NET_EXPORT DefaultChannelIDStore : public ChannelIDStore { base::Time* expiration_time, std::string* private_key_result, std::string* cert_result, - const GetChannelIDCallback& callback) OVERRIDE; + const GetChannelIDCallback& callback) override; virtual void SetChannelID( const std::string& server_identifier, base::Time creation_time, base::Time expiration_time, const std::string& private_key, - const std::string& cert) OVERRIDE; + const std::string& cert) override; virtual void DeleteChannelID( const std::string& server_identifier, - const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; virtual void DeleteAllCreatedBetween( base::Time delete_begin, base::Time delete_end, - const base::Closure& callback) OVERRIDE; - virtual void DeleteAll(const base::Closure& callback) OVERRIDE; + const base::Closure& callback) override; + virtual void DeleteAll(const base::Closure& callback) override; virtual void GetAllChannelIDs( - const GetChannelIDListCallback& callback) OVERRIDE; - virtual int GetChannelIDCount() OVERRIDE; - virtual void SetForceKeepSessionState() OVERRIDE; + const GetChannelIDListCallback& callback) override; + virtual int GetChannelIDCount() override; + virtual void SetForceKeepSessionState() override; private: class Task; diff --git a/net/ssl/default_channel_id_store_unittest.cc b/net/ssl/default_channel_id_store_unittest.cc index b1fe873..9429753 100644 --- a/net/ssl/default_channel_id_store_unittest.cc +++ b/net/ssl/default_channel_id_store_unittest.cc @@ -69,12 +69,12 @@ class MockPersistentStore MockPersistentStore(); // DefaultChannelIDStore::PersistentStore implementation. - virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE; + virtual void Load(const LoadedCallback& loaded_callback) override; virtual void AddChannelID( - const DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE; + const DefaultChannelIDStore::ChannelID& channel_id) override; virtual void DeleteChannelID( - const DefaultChannelIDStore::ChannelID& channel_id) OVERRIDE; - virtual void SetForceKeepSessionState() OVERRIDE; + const DefaultChannelIDStore::ChannelID& channel_id) override; + virtual void SetForceKeepSessionState() override; protected: virtual ~MockPersistentStore(); diff --git a/net/ssl/ssl_client_auth_cache.h b/net/ssl/ssl_client_auth_cache.h index 93ad8c0..4ee47ed 100644 --- a/net/ssl/ssl_client_auth_cache.h +++ b/net/ssl/ssl_client_auth_cache.h @@ -48,7 +48,7 @@ class NET_EXPORT_PRIVATE SSLClientAuthCache : public CertDatabase::Observer { void Remove(const HostPortPair& server); // CertDatabase::Observer methods: - virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE; + virtual void OnCertAdded(const X509Certificate* cert) override; private: typedef HostPortPair AuthCacheKey; diff --git a/net/ssl/ssl_config_service_defaults.h b/net/ssl/ssl_config_service_defaults.h index 85123da..ff58029d 100644 --- a/net/ssl/ssl_config_service_defaults.h +++ b/net/ssl/ssl_config_service_defaults.h @@ -18,7 +18,7 @@ class NET_EXPORT SSLConfigServiceDefaults : public SSLConfigService { SSLConfigServiceDefaults(); // Store default SSL config settings in |config|. - virtual void GetSSLConfig(SSLConfig* config) OVERRIDE; + virtual void GetSSLConfig(SSLConfig* config) override; private: virtual ~SSLConfigServiceDefaults(); diff --git a/net/ssl/ssl_config_service_unittest.cc b/net/ssl/ssl_config_service_unittest.cc index e8a4c33..0d9659c 100644 --- a/net/ssl/ssl_config_service_unittest.cc +++ b/net/ssl/ssl_config_service_unittest.cc @@ -19,7 +19,7 @@ class MockSSLConfigService : public SSLConfigService { explicit MockSSLConfigService(const SSLConfig& config) : config_(config) {} // SSLConfigService implementation - virtual void GetSSLConfig(SSLConfig* config) OVERRIDE { + virtual void GetSSLConfig(SSLConfig* config) override { *config = config_; } diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc index 3d609cc..b266c55 100644 --- a/net/test/embedded_test_server/embedded_test_server.cc +++ b/net/test/embedded_test_server/embedded_test_server.cc @@ -32,7 +32,7 @@ class CustomHttpResponse : public HttpResponse { : headers_(headers), contents_(contents) { } - virtual std::string ToResponseString() const OVERRIDE { + virtual std::string ToResponseString() const override { return headers_ + "\r\n" + contents_; } diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h index 82303e5..fc9f554 100644 --- a/net/test/embedded_test_server/embedded_test_server.h +++ b/net/test/embedded_test_server/embedded_test_server.h @@ -167,11 +167,11 @@ class EmbeddedTestServer : public StreamListenSocket::Delegate { // StreamListenSocket::Delegate overrides: virtual void DidAccept(StreamListenSocket* server, - scoped_ptr<StreamListenSocket> connection) OVERRIDE; + scoped_ptr<StreamListenSocket> connection) override; virtual void DidRead(StreamListenSocket* connection, const char* data, - int length) OVERRIDE; - virtual void DidClose(StreamListenSocket* connection) OVERRIDE; + int length) override; + virtual void DidClose(StreamListenSocket* connection) override; HttpConnection* FindConnection(StreamListenSocket* socket); diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc index 9823947..9da982c 100644 --- a/net/test/embedded_test_server/embedded_test_server_unittest.cc +++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc @@ -49,7 +49,7 @@ class EmbeddedTestServerTest: public testing::Test, io_thread_("io_thread") { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { base::Thread::Options thread_options; thread_options.message_loop_type = base::MessageLoop::TYPE_IO; ASSERT_TRUE(io_thread_.StartWithOptions(thread_options)); @@ -61,12 +61,12 @@ class EmbeddedTestServerTest: public testing::Test, ASSERT_TRUE(server_->InitializeAndWaitUntilReady()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { ASSERT_TRUE(server_->ShutdownAndWaitUntilComplete()); } // URLFetcherDelegate override. - virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const URLFetcher* source) override { ++num_responses_received_; if (num_responses_received_ == num_responses_expected_) base::MessageLoop::current()->Quit(); @@ -260,7 +260,7 @@ class EmbeddedTestServerThreadingTestDelegate message_loop_present_on_shutdown_(message_loop_present_on_shutdown) {} // base::PlatformThread::Delegate: - virtual void ThreadMain() OVERRIDE { + virtual void ThreadMain() override { scoped_refptr<base::SingleThreadTaskRunner> io_thread_runner; base::Thread io_thread("io_thread"); base::Thread::Options thread_options; @@ -298,7 +298,7 @@ class EmbeddedTestServerThreadingTestDelegate } // URLFetcherDelegate override. - virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const URLFetcher* source) override { base::MessageLoop::current()->Quit(); } diff --git a/net/test/embedded_test_server/http_response.h b/net/test/embedded_test_server/http_response.h index 422a5255..2172354 100644 --- a/net/test/embedded_test_server/http_response.h +++ b/net/test/embedded_test_server/http_response.h @@ -54,7 +54,7 @@ class BasicHttpResponse : public HttpResponse { } // Generates and returns a http response string. - virtual std::string ToResponseString() const OVERRIDE; + virtual std::string ToResponseString() const override; private: HttpStatusCode code_; diff --git a/net/test/net_test_suite.cc b/net/test/net_test_suite.cc index 175cec29..ed8a103 100644 --- a/net/test/net_test_suite.cc +++ b/net/test/net_test_suite.cc @@ -15,7 +15,7 @@ #endif class StaticReset : public ::testing::EmptyTestEventListener { - virtual void OnTestStart(const ::testing::TestInfo& test_info) OVERRIDE { + virtual void OnTestStart(const ::testing::TestInfo& test_info) override { net::HttpStreamFactory::ResetStaticSettingsToInit(); } }; diff --git a/net/test/net_test_suite.h b/net/test/net_test_suite.h index c8479d7..1a400d4 100644 --- a/net/test/net_test_suite.h +++ b/net/test/net_test_suite.h @@ -23,9 +23,9 @@ class NetTestSuite : public base::TestSuite { NetTestSuite(int argc, char** argv); virtual ~NetTestSuite(); - virtual void Initialize() OVERRIDE; + virtual void Initialize() override; - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; protected: // This constructor is only accessible to specialized net test diff --git a/net/test/spawned_test_server/local_test_server_posix.cc b/net/test/spawned_test_server/local_test_server_posix.cc index fdcfdab..64c9b44 100644 --- a/net/test/spawned_test_server/local_test_server_posix.cc +++ b/net/test/spawned_test_server/local_test_server_posix.cc @@ -34,7 +34,7 @@ class OrphanedTestServerFilter : public base::ProcessFilter { : path_string_(path_string), port_string_(port_string) {} - virtual bool Includes(const base::ProcessEntry& entry) const OVERRIDE { + virtual bool Includes(const base::ProcessEntry& entry) const override { if (entry.parent_pid() != 1) return false; bool found_path_string = false; diff --git a/net/test/spawned_test_server/spawner_communicator.h b/net/test/spawned_test_server/spawner_communicator.h index b657ac3..549ad91 100644 --- a/net/test/spawned_test_server/spawner_communicator.h +++ b/net/test/spawned_test_server/spawner_communicator.h @@ -100,8 +100,8 @@ class SpawnerCommunicator : public net::URLRequest::Delegate { std::string* data_received); // URLRequest::Delegate methods. Called on the IO thread. - virtual void OnResponseStarted(URLRequest* request) OVERRIDE; - virtual void OnReadCompleted(URLRequest* request, int num_bytes) OVERRIDE; + virtual void OnResponseStarted(URLRequest* request) override; + virtual void OnReadCompleted(URLRequest* request, int num_bytes) override; // Reads Result from the response. Called on the IO thread. void ReadResult(URLRequest* request); diff --git a/net/test/url_request/url_request_failed_job.h b/net/test/url_request/url_request_failed_job.h index 6d3cf2d..ea35116 100644 --- a/net/test/url_request/url_request_failed_job.h +++ b/net/test/url_request/url_request_failed_job.h @@ -22,7 +22,7 @@ class URLRequestFailedJob : public URLRequestJob { NetworkDelegate* network_delegate, int net_error); - virtual void Start() OVERRIDE; + virtual void Start() override; // Adds the testing URLs to the URLRequestFilter. static void AddUrlHandler(); diff --git a/net/test/url_request/url_request_mock_http_job.cc b/net/test/url_request/url_request_mock_http_job.cc index 42af81f..c611f36 100644 --- a/net/test/url_request/url_request_mock_http_job.cc +++ b/net/test/url_request/url_request_mock_http_job.cc @@ -42,7 +42,7 @@ class MockJobInterceptor : public net::URLRequestInterceptor { // net::URLRequestJobFactory::ProtocolHandler implementation virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { return new URLRequestMockHTTPJob( request, network_delegate, diff --git a/net/test/url_request/url_request_mock_http_job.h b/net/test/url_request/url_request_mock_http_job.h index cb93412..eb68a2d 100644 --- a/net/test/url_request/url_request_mock_http_job.h +++ b/net/test/url_request/url_request_mock_http_job.h @@ -34,13 +34,13 @@ class URLRequestMockHTTPJob : public URLRequestFileJob { const base::FilePath& file_path, const scoped_refptr<base::TaskRunner>& task_runner); - virtual void Start() OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; - virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE; + virtual void Start() override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual int GetResponseCode() const override; + virtual bool GetCharset(std::string* charset) override; + virtual void GetResponseInfo(HttpResponseInfo* info) override; virtual bool IsRedirectResponse(GURL* location, - int* http_status_code) OVERRIDE; + int* http_status_code) override; // Adds the testing URLs to the URLRequestFilter. static void AddUrlHandler( diff --git a/net/tools/balsa/balsa_frame.h b/net/tools/balsa/balsa_frame.h index 6178d79..73c3dd9 100644 --- a/net/tools/balsa/balsa_frame.h +++ b/net/tools/balsa/balsa_frame.h @@ -201,11 +201,11 @@ class BalsaFrame { private: class DoNothingBalsaVisitor : public BalsaVisitorInterface { - virtual void ProcessBodyInput(const char *input, size_t size) OVERRIDE {} - virtual void ProcessBodyData(const char *input, size_t size) OVERRIDE {} - virtual void ProcessHeaderInput(const char *input, size_t size) OVERRIDE {} - virtual void ProcessTrailerInput(const char *input, size_t size) OVERRIDE {} - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE {} + virtual void ProcessBodyInput(const char *input, size_t size) override {} + virtual void ProcessBodyData(const char *input, size_t size) override {} + virtual void ProcessHeaderInput(const char *input, size_t size) override {} + virtual void ProcessTrailerInput(const char *input, size_t size) override {} + virtual void ProcessHeaders(const BalsaHeaders& headers) override {} virtual void ProcessRequestFirstLine(const char* line_input, size_t line_length, const char* method_input, @@ -213,7 +213,7 @@ class BalsaFrame { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE {} + size_t version_length) override {} virtual void ProcessResponseFirstLine(const char *line_input, size_t line_length, const char *version_input, @@ -221,16 +221,16 @@ class BalsaFrame { const char *status_input, size_t status_length, const char *reason_input, - size_t reason_length) OVERRIDE {} - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {} + size_t reason_length) override {} + virtual void ProcessChunkLength(size_t chunk_length) override {} virtual void ProcessChunkExtensions(const char *input, - size_t size) OVERRIDE {} - virtual void HeaderDone() OVERRIDE {} - virtual void MessageDone() OVERRIDE {} - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE {} - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {} - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE {} - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE {} + size_t size) override {} + virtual void HeaderDone() override {} + virtual void MessageDone() override {} + virtual void HandleHeaderError(BalsaFrame* framer) override {} + virtual void HandleHeaderWarning(BalsaFrame* framer) override {} + virtual void HandleChunkingError(BalsaFrame* framer) override {} + virtual void HandleBodyError(BalsaFrame* framer) override {} }; bool last_char_was_slash_r_; diff --git a/net/tools/balsa/balsa_frame_test.cc b/net/tools/balsa/balsa_frame_test.cc index 2582721..334f5ef 100644 --- a/net/tools/balsa/balsa_frame_test.cc +++ b/net/tools/balsa/balsa_frame_test.cc @@ -58,7 +58,7 @@ class Visitor : public BalsaVisitorInterface { class BalsaFrameTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { frame_.reset(new BalsaFrame); frame_headers_.reset(new BalsaHeaders); visitor_.reset(new Visitor); diff --git a/net/tools/balsa/balsa_headers_test.cc b/net/tools/balsa/balsa_headers_test.cc index da2ad19..b1479c6 100644 --- a/net/tools/balsa/balsa_headers_test.cc +++ b/net/tools/balsa/balsa_headers_test.cc @@ -19,7 +19,7 @@ using ::base::StringPiece; class BalsaBufferTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { buffer_.reset(new BalsaBuffer); anotherBuffer_.reset(new BalsaBuffer); } @@ -33,7 +33,7 @@ namespace { class BalsaHeadersTest: public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { headers_.reset(new BalsaHeaders); } diff --git a/net/tools/balsa/noop_balsa_visitor.h b/net/tools/balsa/noop_balsa_visitor.h index c0136f1..c47b0b3 100644 --- a/net/tools/balsa/noop_balsa_visitor.h +++ b/net/tools/balsa/noop_balsa_visitor.h @@ -19,11 +19,11 @@ class NoOpBalsaVisitor : public BalsaVisitorInterface { NoOpBalsaVisitor() { } virtual ~NoOpBalsaVisitor() { } - virtual void ProcessBodyInput(const char* input, size_t size) OVERRIDE { } - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE { } - virtual void ProcessHeaderInput(const char* input, size_t size) OVERRIDE { } - virtual void ProcessTrailerInput(const char* input, size_t size) OVERRIDE { } - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE { } + virtual void ProcessBodyInput(const char* input, size_t size) override { } + virtual void ProcessBodyData(const char* input, size_t size) override { } + virtual void ProcessHeaderInput(const char* input, size_t size) override { } + virtual void ProcessTrailerInput(const char* input, size_t size) override { } + virtual void ProcessHeaders(const BalsaHeaders& headers) override { } virtual void ProcessRequestFirstLine(const char* line_input, size_t line_length, @@ -32,7 +32,7 @@ class NoOpBalsaVisitor : public BalsaVisitorInterface { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE { } + size_t version_length) override { } virtual void ProcessResponseFirstLine(const char* line_input, size_t line_length, const char* version_input, @@ -40,16 +40,16 @@ class NoOpBalsaVisitor : public BalsaVisitorInterface { const char* status_input, size_t status_length, const char* reason_input, - size_t reason_length) OVERRIDE { } - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE { } - virtual void ProcessChunkExtensions(const char* input, size_t size) OVERRIDE { + size_t reason_length) override { } + virtual void ProcessChunkLength(size_t chunk_length) override { } + virtual void ProcessChunkExtensions(const char* input, size_t size) override { } - virtual void HeaderDone() OVERRIDE { } - virtual void MessageDone() OVERRIDE { } - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE { } - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE { } - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE { } - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE { } + virtual void HeaderDone() override { } + virtual void MessageDone() override { } + virtual void HandleHeaderError(BalsaFrame* framer) override { } + virtual void HandleHeaderWarning(BalsaFrame* framer) override { } + virtual void HandleChunkingError(BalsaFrame* framer) override { } + virtual void HandleBodyError(BalsaFrame* framer) override { } private: DISALLOW_COPY_AND_ASSIGN(NoOpBalsaVisitor); diff --git a/net/tools/balsa/simple_buffer.h b/net/tools/balsa/simple_buffer.h index a550617..d58894e 100644 --- a/net/tools/balsa/simple_buffer.h +++ b/net/tools/balsa/simple_buffer.h @@ -32,32 +32,32 @@ class SimpleBuffer : public BufferInterface { // The following functions all override pure virtual functions // in BufferInterface. See buffer_interface.h for a description // of what they do. - virtual int ReadableBytes() const OVERRIDE; - virtual int BufferSize() const OVERRIDE; - virtual int BytesFree() const OVERRIDE; + virtual int ReadableBytes() const override; + virtual int BufferSize() const override; + virtual int BytesFree() const override; - virtual bool Empty() const OVERRIDE; - virtual bool Full() const OVERRIDE; + virtual bool Empty() const override; + virtual bool Full() const override; - virtual int Write(const char* bytes, int size) OVERRIDE; + virtual int Write(const char* bytes, int size) override; - virtual void GetWritablePtr(char **ptr, int* size) const OVERRIDE; + virtual void GetWritablePtr(char **ptr, int* size) const override; - virtual void GetReadablePtr(char **ptr, int* size) const OVERRIDE; + virtual void GetReadablePtr(char **ptr, int* size) const override; - virtual int Read(char* bytes, int size) OVERRIDE; + virtual int Read(char* bytes, int size) override; - virtual void Clear() OVERRIDE; + virtual void Clear() override; // This can be an expensive operation: costing a new/delete, and copying of // all existing data. Even if the existing buffer does not need to be // resized, unread data may still need to be non-destructively copied to // consolidate fragmented free space. - virtual bool Reserve(int size) OVERRIDE; + virtual bool Reserve(int size) override; - virtual void AdvanceReadablePtr(int amount_to_advance) OVERRIDE; + virtual void AdvanceReadablePtr(int amount_to_advance) override; - virtual void AdvanceWritablePtr(int amount_to_advance) OVERRIDE; + virtual void AdvanceWritablePtr(int amount_to_advance) override; void Swap(SimpleBuffer* other) { char* tmp = storage_; diff --git a/net/tools/dump_cache/cache_dumper.h b/net/tools/dump_cache/cache_dumper.h index 9c5837c..46c3eec 100644 --- a/net/tools/dump_cache/cache_dumper.h +++ b/net/tools/dump_cache/cache_dumper.h @@ -48,12 +48,12 @@ class CacheDumper : public CacheDumpWriter { explicit CacheDumper(disk_cache::Backend* cache); virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int WriteEntry(disk_cache::Entry* entry, int stream, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual void CloseEntry(disk_cache::Entry* entry, base::Time last_used, - base::Time last_modified) OVERRIDE; + base::Time last_modified) override; private: disk_cache::Backend* cache_; @@ -65,12 +65,12 @@ class DiskDumper : public CacheDumpWriter { explicit DiskDumper(const base::FilePath& path); virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual int WriteEntry(disk_cache::Entry* entry, int stream, int offset, net::IOBuffer* buf, int buf_len, - const net::CompletionCallback& callback) OVERRIDE; + const net::CompletionCallback& callback) override; virtual void CloseEntry(disk_cache::Entry* entry, base::Time last_used, - base::Time last_modified) OVERRIDE; + base::Time last_modified) override; private: base::FilePath path_; diff --git a/net/tools/epoll_server/epoll_server.cc b/net/tools/epoll_server/epoll_server.cc index a382dba..7ccae1d 100644 --- a/net/tools/epoll_server/epoll_server.cc +++ b/net/tools/epoll_server/epoll_server.cc @@ -60,7 +60,7 @@ namespace net { // Clears the pipe and returns. Used for waking the epoll server up. class ReadPipeCallback : public EpollCallbackInterface { public: - virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE { + virtual void OnEvent(int fd, EpollEvent* event) override { DCHECK(event->in_events == EPOLLIN); int data; int data_read = 1; @@ -69,10 +69,10 @@ class ReadPipeCallback : public EpollCallbackInterface { data_read = read(fd, &data, sizeof(data)); } } - virtual void OnShutdown(EpollServer *eps, int fd) OVERRIDE {} - virtual void OnRegistration(EpollServer*, int, int) OVERRIDE {} - virtual void OnModification(int, int) OVERRIDE {} // COV_NF_LINE - virtual void OnUnregistration(int, bool) OVERRIDE {} // COV_NF_LINE + virtual void OnShutdown(EpollServer *eps, int fd) override {} + virtual void OnRegistration(EpollServer*, int, int) override {} + virtual void OnModification(int, int) override {} // COV_NF_LINE + virtual void OnUnregistration(int, bool) override {} // COV_NF_LINE }; //////////////////////////////////////////////////////////////////////////////// diff --git a/net/tools/epoll_server/epoll_server.h b/net/tools/epoll_server/epoll_server.h index 8822450..e8f1396 100644 --- a/net/tools/epoll_server/epoll_server.h +++ b/net/tools/epoll_server/epoll_server.h @@ -1023,17 +1023,17 @@ class EpollAlarm : public EpollAlarmCallbackInterface { // Marks the alarm as unregistered and returns 0. The return value may be // safely ignored by subclasses. - virtual int64 OnAlarm() OVERRIDE; + virtual int64 OnAlarm() override; // Marks the alarm as registered, and stores the token. virtual void OnRegistration(const EpollServer::AlarmRegToken& token, - EpollServer* eps) OVERRIDE; + EpollServer* eps) override; // Marks the alarm as unregistered. - virtual void OnUnregistration() OVERRIDE; + virtual void OnUnregistration() override; // Marks the alarm as unregistered. - virtual void OnShutdown(EpollServer* eps) OVERRIDE; + virtual void OnShutdown(EpollServer* eps) override; // If the alarm was registered, unregister it. void UnregisterIfRegistered(); diff --git a/net/tools/flip_server/acceptor_thread.h b/net/tools/flip_server/acceptor_thread.h index bcaa43e..ecb4316 100644 --- a/net/tools/flip_server/acceptor_thread.h +++ b/net/tools/flip_server/acceptor_thread.h @@ -52,14 +52,14 @@ class SMAcceptorThread : public base::SimpleThread, // EpollCallbackInteface interface virtual void OnRegistration(EpollServer* eps, int fd, - int event_mask) OVERRIDE {} - virtual void OnModification(int fd, int event_mask) OVERRIDE {} - virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE; - virtual void OnUnregistration(int fd, bool replaced) OVERRIDE {} - virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE {} + int event_mask) override {} + virtual void OnModification(int fd, int event_mask) override {} + virtual void OnEvent(int fd, EpollEvent* event) override; + virtual void OnUnregistration(int fd, bool replaced) override {} + virtual void OnShutdown(EpollServer* eps, int fd) override {} // SMConnectionPool interface - virtual void SMConnectionDone(SMConnection* sc) OVERRIDE; + virtual void SMConnectionDone(SMConnection* sc) override; // TODO(mbelshe): figure out if we can move these to private functions. SMConnection* NewConnection(); @@ -75,7 +75,7 @@ class SMAcceptorThread : public base::SimpleThread, // idle longer than the configured timeout. void HandleConnectionIdleTimeout(); - virtual void Run() OVERRIDE; + virtual void Run() override; private: EpollServer epoll_server_; diff --git a/net/tools/flip_server/http_interface.h b/net/tools/flip_server/http_interface.h index 30b7979..08a595e 100644 --- a/net/tools/flip_server/http_interface.h +++ b/net/tools/flip_server/http_interface.h @@ -32,11 +32,11 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { private: // BalsaVisitorInterface: - virtual void ProcessBodyInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE; - virtual void ProcessHeaderInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessTrailerInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE; + virtual void ProcessBodyInput(const char* input, size_t size) override {} + virtual void ProcessBodyData(const char* input, size_t size) override; + virtual void ProcessHeaderInput(const char* input, size_t size) override {} + virtual void ProcessTrailerInput(const char* input, size_t size) override {} + virtual void ProcessHeaders(const BalsaHeaders& headers) override; virtual void ProcessRequestFirstLine(const char* line_input, size_t line_length, const char* method_input, @@ -44,7 +44,7 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE {} + size_t version_length) override {} virtual void ProcessResponseFirstLine(const char* line_input, size_t line_length, const char* version_input, @@ -52,28 +52,28 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { const char* status_input, size_t status_length, const char* reason_input, - size_t reason_length) OVERRIDE {} - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {} - virtual void ProcessChunkExtensions(const char* input, size_t size) OVERRIDE { + size_t reason_length) override {} + virtual void ProcessChunkLength(size_t chunk_length) override {} + virtual void ProcessChunkExtensions(const char* input, size_t size) override { } - virtual void HeaderDone() OVERRIDE {} - virtual void MessageDone() OVERRIDE; - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE; - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {} - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE; - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE; + virtual void HeaderDone() override {} + virtual void MessageDone() override; + virtual void HandleHeaderError(BalsaFrame* framer) override; + virtual void HandleHeaderWarning(BalsaFrame* framer) override {} + virtual void HandleChunkingError(BalsaFrame* framer) override; + virtual void HandleBodyError(BalsaFrame* framer) override; void HandleError(); public: void AddToOutputOrder(const MemCacheIter& mci); BalsaFrame* spdy_framer() { return http_framer_; } - virtual void set_is_request() OVERRIDE {} + virtual void set_is_request() override {} const OutputOrdering& output_ordering() const { return output_ordering_; } // SMInterface: virtual void InitSMInterface(SMInterface* sm_spdy_interface, - int32 server_idx) OVERRIDE; + int32 server_idx) override; virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool, SMInterface* sm_interface, EpollServer* epoll_server, @@ -81,33 +81,33 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { std::string server_ip, std::string server_port, std::string remote_ip, - bool use_ssl) OVERRIDE; - virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE; - virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE; - virtual bool MessageFullyRead() const OVERRIDE; - virtual void SetStreamID(uint32 stream_id) OVERRIDE; - virtual bool Error() const OVERRIDE; - virtual const char* ErrorAsString() const OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void ResetForNewInterface(int32 server_idx) OVERRIDE {} - virtual void ResetForNewConnection() OVERRIDE; - virtual void Cleanup() OVERRIDE; - virtual int PostAcceptHook() OVERRIDE; + bool use_ssl) override; + virtual size_t ProcessReadInput(const char* data, size_t len) override; + virtual size_t ProcessWriteInput(const char* data, size_t len) override; + virtual bool MessageFullyRead() const override; + virtual void SetStreamID(uint32 stream_id) override; + virtual bool Error() const override; + virtual const char* ErrorAsString() const override; + virtual void Reset() override; + virtual void ResetForNewInterface(int32 server_idx) override {} + virtual void ResetForNewConnection() override; + virtual void Cleanup() override; + virtual int PostAcceptHook() override; virtual void NewStream(uint32 stream_id, uint32 priority, - const std::string& filename) OVERRIDE; - virtual void SendEOF(uint32 stream_id) OVERRIDE; - virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE; + const std::string& filename) override; + virtual void SendEOF(uint32 stream_id) override; + virtual void SendErrorNotFound(uint32 stream_id) override; virtual size_t SendSynStream(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual size_t SendSynReply(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len, uint32 flags, - bool compress) OVERRIDE; + bool compress) override; private: void SendEOFImpl(uint32 stream_id); @@ -121,7 +121,7 @@ class HttpSM : public BalsaVisitorInterface, public SMInterface { uint32 flags, bool compress); void EnqueueDataFrame(DataFrame* df); - virtual void GetOutput() OVERRIDE; + virtual void GetOutput() override; private: BalsaFrame* http_framer_; diff --git a/net/tools/flip_server/http_interface_test.cc b/net/tools/flip_server/http_interface_test.cc index 969607b..9e72279 100644 --- a/net/tools/flip_server/http_interface_test.cc +++ b/net/tools/flip_server/http_interface_test.cc @@ -86,7 +86,7 @@ class FlipHttpSMTest : public ::testing::Test { acceptor_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (acceptor_->listen_fd_ >= 0) { epoll_server_->UnregisterFD(acceptor_->listen_fd_); close(acceptor_->listen_fd_); diff --git a/net/tools/flip_server/mem_cache.h b/net/tools/flip_server/mem_cache.h index 76ffc95..63befee 100644 --- a/net/tools/flip_server/mem_cache.h +++ b/net/tools/flip_server/mem_cache.h @@ -21,11 +21,11 @@ class StoreBodyAndHeadersVisitor : public BalsaVisitorInterface { void HandleError() { error_ = true; } // BalsaVisitorInterface: - virtual void ProcessBodyInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE; - virtual void ProcessHeaderInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessTrailerInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE { + virtual void ProcessBodyInput(const char* input, size_t size) override {} + virtual void ProcessBodyData(const char* input, size_t size) override; + virtual void ProcessHeaderInput(const char* input, size_t size) override {} + virtual void ProcessTrailerInput(const char* input, size_t size) override {} + virtual void ProcessHeaders(const BalsaHeaders& headers) override { // nothing to do here-- we're assuming that the BalsaFrame has // been handed our headers. } @@ -36,7 +36,7 @@ class StoreBodyAndHeadersVisitor : public BalsaVisitorInterface { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE {} + size_t version_length) override {} virtual void ProcessResponseFirstLine(const char* line_input, size_t line_length, const char* version_input, @@ -44,16 +44,16 @@ class StoreBodyAndHeadersVisitor : public BalsaVisitorInterface { const char* status_input, size_t status_length, const char* reason_input, - size_t reason_length) OVERRIDE {} - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {} - virtual void ProcessChunkExtensions(const char* input, size_t size) OVERRIDE { + size_t reason_length) override {} + virtual void ProcessChunkLength(size_t chunk_length) override {} + virtual void ProcessChunkExtensions(const char* input, size_t size) override { } - virtual void HeaderDone() OVERRIDE {} - virtual void MessageDone() OVERRIDE {} - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE; - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE; - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE; - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE; + virtual void HeaderDone() override {} + virtual void MessageDone() override {} + virtual void HandleHeaderError(BalsaFrame* framer) override; + virtual void HandleHeaderWarning(BalsaFrame* framer) override; + virtual void HandleChunkingError(BalsaFrame* framer) override; + virtual void HandleBodyError(BalsaFrame* framer) override; BalsaHeaders headers; std::string body; diff --git a/net/tools/flip_server/mem_cache_test.cc b/net/tools/flip_server/mem_cache_test.cc index 5e45bb5..bb01907 100644 --- a/net/tools/flip_server/mem_cache_test.cc +++ b/net/tools/flip_server/mem_cache_test.cc @@ -16,7 +16,7 @@ class MemoryCacheWithFakeReadToString : public MemoryCache { virtual ~MemoryCacheWithFakeReadToString() {} virtual void ReadToString(const char* filename, - std::string* output) OVERRIDE { + std::string* output) override { *output = data_map_[filename]; } diff --git a/net/tools/flip_server/output_ordering.h b/net/tools/flip_server/output_ordering.h index 596f382..488d2e9 100644 --- a/net/tools/flip_server/output_ordering.h +++ b/net/tools/flip_server/output_ordering.h @@ -56,11 +56,11 @@ class OutputOrdering { virtual ~BeginOutputtingAlarm(); // EpollAlarmCallbackInterface: - virtual int64 OnAlarm() OVERRIDE; + virtual int64 OnAlarm() override; virtual void OnRegistration(const EpollServer::AlarmRegToken& tok, - EpollServer* eps) OVERRIDE; - virtual void OnUnregistration() OVERRIDE; - virtual void OnShutdown(EpollServer* eps) OVERRIDE; + EpollServer* eps) override; + virtual void OnUnregistration() override; + virtual void OnShutdown(EpollServer* eps) override; private: OutputOrdering* output_ordering_; diff --git a/net/tools/flip_server/ring_buffer.h b/net/tools/flip_server/ring_buffer.h index b129ee8..bb3b39f 100644 --- a/net/tools/flip_server/ring_buffer.h +++ b/net/tools/flip_server/ring_buffer.h @@ -38,32 +38,32 @@ class RingBuffer : public BufferInterface { // The following functions all override pure virtual functions // in BufferInterface. See buffer_interface.h for a description // of what they do if the function isn't documented here. - virtual int ReadableBytes() const OVERRIDE; - virtual int BufferSize() const OVERRIDE; - virtual int BytesFree() const OVERRIDE; + virtual int ReadableBytes() const override; + virtual int BufferSize() const override; + virtual int BytesFree() const override; - virtual bool Empty() const OVERRIDE; - virtual bool Full() const OVERRIDE; + virtual bool Empty() const override; + virtual bool Full() const override; // returns the number of characters written. // appends up-to-'size' bytes to the ringbuffer. - virtual int Write(const char* bytes, int size) OVERRIDE; + virtual int Write(const char* bytes, int size) override; // Stores a pointer into the ring buffer in *ptr, and stores the number of // characters which are allowed to be written in *size. // If there are no writable bytes available, then *size will contain 0. - virtual void GetWritablePtr(char** ptr, int* size) const OVERRIDE; + virtual void GetWritablePtr(char** ptr, int* size) const override; // Stores a pointer into the ring buffer in *ptr, and stores the number of // characters which are allowed to be read in *size. // If there are no readable bytes available, then *size will contain 0. - virtual void GetReadablePtr(char** ptr, int* size) const OVERRIDE; + virtual void GetReadablePtr(char** ptr, int* size) const override; // Returns the number of bytes read into 'bytes'. - virtual int Read(char* bytes, int size) OVERRIDE; + virtual int Read(char* bytes, int size) override; // Removes all data from the ring buffer. - virtual void Clear() OVERRIDE; + virtual void Clear() override; // Reserves contiguous writable empty space in the buffer of size bytes. // Since the point of this class is to have a fixed size buffer, be careful @@ -76,15 +76,15 @@ class RingBuffer : public BufferInterface { // to consolidate fragmented free space. If the size requested is less than // or equal to BytesFree(), it is guaranteed that the buffer size will not // change. - virtual bool Reserve(int size) OVERRIDE; + virtual bool Reserve(int size) override; // Removes the oldest 'amount_to_advance' characters. // If amount_to_consume > ReadableBytes(), this performs a Clear() instead. - virtual void AdvanceReadablePtr(int amount_to_advance) OVERRIDE; + virtual void AdvanceReadablePtr(int amount_to_advance) override; // Moves the internal pointers around such that the amount of data specified // here is expected to already be resident (as if it was Written). - virtual void AdvanceWritablePtr(int amount_to_advance) OVERRIDE; + virtual void AdvanceWritablePtr(int amount_to_advance) override; protected: int read_idx() const { return read_idx_; } diff --git a/net/tools/flip_server/sm_connection.h b/net/tools/flip_server/sm_connection.h index 2fe3228..5c5a5fd 100644 --- a/net/tools/flip_server/sm_connection.h +++ b/net/tools/flip_server/sm_connection.h @@ -57,10 +57,10 @@ class SMConnection : public SMConnectionInterface, std::string server_ip_; std::string server_port_; - virtual EpollServer* epoll_server() OVERRIDE; + virtual EpollServer* epoll_server() override; OutputList* output_list() { return &output_list_; } MemoryCache* memory_cache() { return memory_cache_; } - virtual void ReadyToSend() OVERRIDE; + virtual void ReadyToSend() override; void EnqueueDataFrame(DataFrame* df); int fd() const { return fd_; } @@ -84,14 +84,14 @@ class SMConnection : public SMConnectionInterface, // EpollCallbackInterface interface. virtual void OnRegistration(EpollServer* eps, int fd, - int event_mask) OVERRIDE; - virtual void OnModification(int fd, int event_mask) OVERRIDE {} - virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE; - virtual void OnUnregistration(int fd, bool replaced) OVERRIDE; - virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE; + int event_mask) override; + virtual void OnModification(int fd, int event_mask) override {} + virtual void OnEvent(int fd, EpollEvent* event) override; + virtual void OnUnregistration(int fd, bool replaced) override; + virtual void OnShutdown(EpollServer* eps, int fd) override; // NotifierInterface interface. - virtual void Notify() OVERRIDE {} + virtual void Notify() override {} void Cleanup(const char* cleanup); diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h index 2174274..2d2437a 100644 --- a/net/tools/flip_server/spdy_interface.h +++ b/net/tools/flip_server/spdy_interface.h @@ -35,7 +35,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { virtual ~SpdySM(); virtual void InitSMInterface(SMInterface* sm_http_interface, - int32 server_idx) OVERRIDE {} + int32 server_idx) override {} virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool, SMInterface* sm_interface, @@ -44,13 +44,13 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { std::string server_ip, std::string server_port, std::string remote_ip, - bool use_ssl) OVERRIDE; + bool use_ssl) override; // Create new SPDY framer after reusing SpdySM and negotiating new version void CreateFramer(SpdyMajorVersion spdy_version); private: - virtual void set_is_request() OVERRIDE {} + virtual void set_is_request() override {} SMInterface* NewConnectionInterface(); // virtual for tests virtual SMInterface* FindOrMakeNewSMConnectionInterface( @@ -63,31 +63,31 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { bool* is_https_scheme); // BufferedSpdyFramerVisitorInterface: - virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE {} + virtual void OnError(SpdyFramer::SpdyError error_code) override {} virtual void OnStreamError(SpdyStreamId stream_id, - const std::string& description) OVERRIDE {} + const std::string& description) override {} // Called after all the header data for SYN_STREAM control frame is received. virtual void OnSynStream(SpdyStreamId stream_id, SpdyStreamId associated_stream_id, SpdyPriority priority, bool fin, bool unidirectional, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; // Called after all the header data for SYN_REPLY control frame is received. virtual void OnSynReply(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; // Called after all the header data for HEADERS control frame is received. virtual void OnHeaders(SpdyStreamId stream_id, bool fin, - const SpdyHeaderBlock& headers) OVERRIDE; + const SpdyHeaderBlock& headers) override; // Called when data frame header is received. virtual void OnDataFrameHeader(SpdyStreamId stream_id, size_t length, - bool fin) OVERRIDE {} + bool fin) override {} // Called when data is received. // |stream_id| The stream receiving data. @@ -98,73 +98,73 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { virtual void OnStreamFrameData(SpdyStreamId stream_id, const char* data, size_t len, - bool fin) OVERRIDE; + bool fin) override; // Called when a SETTINGS frame is received. // |clear_persisted| True if the respective flag is set on the SETTINGS frame. - virtual void OnSettings(bool clear_persisted) OVERRIDE {} + virtual void OnSettings(bool clear_persisted) override {} // Called when an individual setting within a SETTINGS frame has been parsed // and validated. virtual void OnSetting(SpdySettingsIds id, uint8 flags, - uint32 value) OVERRIDE {} + uint32 value) override {} // Called when a PING frame has been parsed. - virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE {} + virtual void OnPing(SpdyPingId unique_id, bool is_ack) override {} // Called when a RST_STREAM frame has been parsed. virtual void OnRstStream(SpdyStreamId stream_id, - SpdyRstStreamStatus status) OVERRIDE; + SpdyRstStreamStatus status) override; // Called when a GOAWAY frame has been parsed. virtual void OnGoAway(SpdyStreamId last_accepted_stream_id, - SpdyGoAwayStatus status) OVERRIDE {} + SpdyGoAwayStatus status) override {} // Called when a WINDOW_UPDATE frame has been parsed. virtual void OnWindowUpdate(SpdyStreamId stream_id, - uint32 delta_window_size) OVERRIDE {} + uint32 delta_window_size) override {} // Called when a PUSH_PROMISE frame has been parsed. virtual void OnPushPromise(SpdyStreamId stream_id, SpdyStreamId promised_stream_id, - const SpdyHeaderBlock& headers) OVERRIDE {} + const SpdyHeaderBlock& headers) override {} - virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE; + virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) override; public: - virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE; - virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE; - virtual bool MessageFullyRead() const OVERRIDE; - virtual void SetStreamID(uint32 stream_id) OVERRIDE {} - virtual bool Error() const OVERRIDE; - virtual const char* ErrorAsString() const OVERRIDE; - virtual void Reset() OVERRIDE {} - virtual void ResetForNewInterface(int32 server_idx) OVERRIDE; - virtual void ResetForNewConnection() OVERRIDE; + virtual size_t ProcessReadInput(const char* data, size_t len) override; + virtual size_t ProcessWriteInput(const char* data, size_t len) override; + virtual bool MessageFullyRead() const override; + virtual void SetStreamID(uint32 stream_id) override {} + virtual bool Error() const override; + virtual const char* ErrorAsString() const override; + virtual void Reset() override {} + virtual void ResetForNewInterface(int32 server_idx) override; + virtual void ResetForNewConnection() override; // SMInterface's Cleanup is currently only called by SMConnection after a // protocol message as been fully read. Spdy's SMInterface does not need // to do any cleanup at this time. // TODO(klindsay) This method is probably not being used properly and // some logic review and method renaming is probably in order. - virtual void Cleanup() OVERRIDE {} + virtual void Cleanup() override {} // Send a settings frame - virtual int PostAcceptHook() OVERRIDE; + virtual int PostAcceptHook() override; virtual void NewStream(uint32 stream_id, uint32 priority, - const std::string& filename) OVERRIDE; + const std::string& filename) override; void AddToOutputOrder(const MemCacheIter& mci); - virtual void SendEOF(uint32 stream_id) OVERRIDE; - virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE; + virtual void SendEOF(uint32 stream_id) override; + virtual void SendErrorNotFound(uint32 stream_id) override; virtual size_t SendSynStream(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual size_t SendSynReply(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len, uint32 flags, - bool compress) OVERRIDE; + bool compress) override; BufferedSpdyFramer* spdy_framer() { return buffered_spdy_framer_.get(); } const OutputOrdering& output_ordering() const { @@ -193,7 +193,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { SpdyDataFlags flags, bool compress); void EnqueueDataFrame(DataFrame* df); - virtual void GetOutput() OVERRIDE; + virtual void GetOutput() override; private: scoped_ptr<BufferedSpdyFramer> buffered_spdy_framer_; diff --git a/net/tools/flip_server/streamer_interface.h b/net/tools/flip_server/streamer_interface.h index 0114491..ca04f1e 100644 --- a/net/tools/flip_server/streamer_interface.h +++ b/net/tools/flip_server/streamer_interface.h @@ -31,7 +31,7 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { void AddToOutputOrder(const MemCacheIter& mci) {} virtual void InitSMInterface(SMInterface* sm_other_interface, - int32 server_idx) OVERRIDE; + int32 server_idx) override; virtual void InitSMConnection(SMConnectionPoolInterface* connection_pool, SMInterface* sm_interface, EpollServer* epoll_server, @@ -39,35 +39,35 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { std::string server_ip, std::string server_port, std::string remote_ip, - bool use_ssl) OVERRIDE; + bool use_ssl) override; - virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE; - virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE; - virtual bool MessageFullyRead() const OVERRIDE; - virtual void SetStreamID(uint32 stream_id) OVERRIDE {} - virtual bool Error() const OVERRIDE; - virtual const char* ErrorAsString() const OVERRIDE; - virtual void Reset() OVERRIDE; - virtual void ResetForNewInterface(int32 server_idx) OVERRIDE {} - virtual void ResetForNewConnection() OVERRIDE; - virtual void Cleanup() OVERRIDE; - virtual int PostAcceptHook() OVERRIDE; + virtual size_t ProcessReadInput(const char* data, size_t len) override; + virtual size_t ProcessWriteInput(const char* data, size_t len) override; + virtual bool MessageFullyRead() const override; + virtual void SetStreamID(uint32 stream_id) override {} + virtual bool Error() const override; + virtual const char* ErrorAsString() const override; + virtual void Reset() override; + virtual void ResetForNewInterface(int32 server_idx) override {} + virtual void ResetForNewConnection() override; + virtual void Cleanup() override; + virtual int PostAcceptHook() override; virtual void NewStream(uint32 stream_id, uint32 priority, - const std::string& filename) OVERRIDE {} - virtual void SendEOF(uint32 stream_id) OVERRIDE {} - virtual void SendErrorNotFound(uint32 stream_id) OVERRIDE {} + const std::string& filename) override {} + virtual void SendEOF(uint32 stream_id) override {} + virtual void SendErrorNotFound(uint32 stream_id) override {} virtual void SendOKResponse(uint32 stream_id, std::string output) {} virtual size_t SendSynStream(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual size_t SendSynReply(uint32 stream_id, - const BalsaHeaders& headers) OVERRIDE; + const BalsaHeaders& headers) override; virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len, uint32 flags, - bool compress) OVERRIDE {} - virtual void set_is_request() OVERRIDE; + bool compress) override {} + virtual void set_is_request() override; static std::string forward_ip_header() { return forward_ip_header_; } static void set_forward_ip_header(std::string value) { forward_ip_header_ = value; @@ -88,14 +88,14 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { int64 len, uint32 flags, bool compress) {} - virtual void GetOutput() OVERRIDE {} + virtual void GetOutput() override {} - virtual void ProcessBodyInput(const char* input, size_t size) OVERRIDE; - virtual void MessageDone() OVERRIDE; - virtual void ProcessHeaders(const BalsaHeaders& headers) OVERRIDE; - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE {} - virtual void ProcessHeaderInput(const char* input, size_t size) OVERRIDE {} - virtual void ProcessTrailerInput(const char* input, size_t size) OVERRIDE {} + virtual void ProcessBodyInput(const char* input, size_t size) override; + virtual void MessageDone() override; + virtual void ProcessHeaders(const BalsaHeaders& headers) override; + virtual void ProcessBodyData(const char* input, size_t size) override {} + virtual void ProcessHeaderInput(const char* input, size_t size) override {} + virtual void ProcessTrailerInput(const char* input, size_t size) override {} virtual void ProcessRequestFirstLine(const char* line_input, size_t line_length, const char* method_input, @@ -103,7 +103,7 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { const char* request_uri_input, size_t request_uri_length, const char* version_input, - size_t version_length) OVERRIDE {} + size_t version_length) override {} virtual void ProcessResponseFirstLine(const char* line_input, size_t line_length, const char* version_input, @@ -111,15 +111,15 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface { const char* status_input, size_t status_length, const char* reason_input, - size_t reason_length) OVERRIDE {} - virtual void ProcessChunkLength(size_t chunk_length) OVERRIDE {} - virtual void ProcessChunkExtensions(const char* input, size_t size) OVERRIDE { + size_t reason_length) override {} + virtual void ProcessChunkLength(size_t chunk_length) override {} + virtual void ProcessChunkExtensions(const char* input, size_t size) override { } - virtual void HeaderDone() OVERRIDE {} - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE; - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE {} - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE; - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE; + virtual void HeaderDone() override {} + virtual void HandleHeaderError(BalsaFrame* framer) override; + virtual void HandleHeaderWarning(BalsaFrame* framer) override {} + virtual void HandleChunkingError(BalsaFrame* framer) override; + virtual void HandleBodyError(BalsaFrame* framer) override; void HandleError(); SMConnection* connection_; diff --git a/net/tools/gdig/file_net_log.h b/net/tools/gdig/file_net_log.h index 0f858bb..005ea31 100644 --- a/net/tools/gdig/file_net_log.h +++ b/net/tools/gdig/file_net_log.h @@ -23,7 +23,7 @@ class FileNetLogObserver : public NetLog::ThreadSafeObserver { virtual ~FileNetLogObserver(); // NetLog::ThreadSafeObserver implementation: - virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE; + virtual void OnAddEntry(const net::NetLog::Entry& entry) override; private: FILE* const destination_; diff --git a/net/tools/get_server_time/get_server_time.cc b/net/tools/get_server_time/get_server_time.cc index ddc08b2..8ad907d 100644 --- a/net/tools/get_server_time/get_server_time.cc +++ b/net/tools/get_server_time/get_server_time.cc @@ -75,18 +75,18 @@ class QuitDelegate : public net::URLFetcherDelegate { virtual ~QuitDelegate() {} // net::URLFetcherDelegate implementation. - virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE { + virtual void OnURLFetchComplete(const net::URLFetcher* source) override { base::MessageLoop::current()->Quit(); } virtual void OnURLFetchDownloadProgress( const net::URLFetcher* source, - int64 current, int64 total) OVERRIDE { + int64 current, int64 total) override { NOTREACHED(); } virtual void OnURLFetchUploadProgress(const net::URLFetcher* source, - int64 current, int64 total) OVERRIDE { + int64 current, int64 total) override { NOTREACHED(); } @@ -106,7 +106,7 @@ class PrintingLogObserver : public net::NetLog::ThreadSafeObserver { } // NetLog::ThreadSafeObserver implementation: - virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE { + virtual void OnAddEntry(const net::NetLog::Entry& entry) override { // The log level of the entry is unknown, so just assume it maps // to VLOG(1). if (!VLOG_IS_ON(1)) diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc index 37c56a5..e9b3496 100644 --- a/net/tools/net_watcher/net_watcher.cc +++ b/net/tools/net_watcher/net_watcher.cc @@ -91,25 +91,25 @@ class NetWatcher : virtual ~NetWatcher() {} // net::NetworkChangeNotifier::IPAddressObserver implementation. - virtual void OnIPAddressChanged() OVERRIDE { + virtual void OnIPAddressChanged() override { LOG(INFO) << "OnIPAddressChanged()"; } // net::NetworkChangeNotifier::ConnectionTypeObserver implementation. virtual void OnConnectionTypeChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE { + net::NetworkChangeNotifier::ConnectionType type) override { LOG(INFO) << "OnConnectionTypeChanged(" << ConnectionTypeToString(type) << ")"; } // net::NetworkChangeNotifier::DNSObserver implementation. - virtual void OnDNSChanged() OVERRIDE { + virtual void OnDNSChanged() override { LOG(INFO) << "OnDNSChanged()"; } // net::NetworkChangeNotifier::NetworkChangeObserver implementation. virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE { + net::NetworkChangeNotifier::ConnectionType type) override { LOG(INFO) << "OnNetworkChanged(" << ConnectionTypeToString(type) << ")"; } @@ -117,7 +117,7 @@ class NetWatcher : // net::ProxyConfigService::Observer implementation. virtual void OnProxyConfigChanged( const net::ProxyConfig& config, - net::ProxyConfigService::ConfigAvailability availability) OVERRIDE { + net::ProxyConfigService::ConfigAvailability availability) override { LOG(INFO) << "OnProxyConfigChanged(" << ProxyConfigToString(config) << ", " << ConfigAvailabilityToString(availability) << ")"; diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc index b7d4c3d..024f467 100644 --- a/net/tools/quic/end_to_end_test.cc +++ b/net/tools/quic/end_to_end_test.cc @@ -159,10 +159,10 @@ class ServerDelegate : public PacketDroppingTestWriter::Delegate { : writer_factory_(writer_factory), dispatcher_(dispatcher) {} virtual ~ServerDelegate() {} - virtual void OnPacketSent(WriteResult result) OVERRIDE { + virtual void OnPacketSent(WriteResult result) override { writer_factory_->OnPacketSent(result); } - virtual void OnCanWrite() OVERRIDE { dispatcher_->OnCanWrite(); } + virtual void OnCanWrite() override { dispatcher_->OnCanWrite(); } private: TestWriterFactory* writer_factory_; QuicDispatcher* dispatcher_; @@ -172,8 +172,8 @@ class ClientDelegate : public PacketDroppingTestWriter::Delegate { public: explicit ClientDelegate(QuicClient* client) : client_(client) {} virtual ~ClientDelegate() {} - virtual void OnPacketSent(WriteResult result) OVERRIDE {} - virtual void OnCanWrite() OVERRIDE { + virtual void OnPacketSent(WriteResult result) override {} + virtual void OnCanWrite() override { EpollEvent event(EPOLLOUT, false); client_->OnEvent(client_->fd(), &event); } @@ -323,14 +323,14 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> { return client_->client()->connected(); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // The ownership of these gets transferred to the QuicPacketWriterWrapper // and TestWriterFactory when Initialize() is executed. client_writer_ = new PacketDroppingTestWriter(); server_writer_ = new PacketDroppingTestWriter(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { StopServer(); } @@ -1107,13 +1107,13 @@ class WrongAddressWriter : public QuicPacketWriterWrapper { const char* buffer, size_t buf_len, const IPAddressNumber& real_self_address, - const IPEndPoint& peer_address) OVERRIDE { + const IPEndPoint& peer_address) override { // Use wrong address! return QuicPacketWriterWrapper::WritePacket( buffer, buf_len, self_address_.address(), peer_address); } - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE { + virtual bool IsWriteBlockedDataBuffered() const override { return false; } diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h index 8b0f1fe..ae5c2d9 100644 --- a/net/tools/quic/quic_client.h +++ b/net/tools/quic/quic_client.h @@ -107,17 +107,17 @@ class QuicClient : public EpollCallbackInterface, // From EpollCallbackInterface virtual void OnRegistration(EpollServer* eps, int fd, - int event_mask) OVERRIDE {} - virtual void OnModification(int fd, int event_mask) OVERRIDE {} - virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE; + int event_mask) override {} + virtual void OnModification(int fd, int event_mask) override {} + virtual void OnEvent(int fd, EpollEvent* event) override; // |fd_| can be unregistered without the client being disconnected. This // happens in b3m QuicProber where we unregister |fd_| to feed in events to // the client from the SelectServer. - virtual void OnUnregistration(int fd, bool replaced) OVERRIDE {} - virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE {} + virtual void OnUnregistration(int fd, bool replaced) override {} + virtual void OnShutdown(EpollServer* eps, int fd) override {} // QuicDataStream::Visitor - virtual void OnClose(QuicDataStream* stream) OVERRIDE; + virtual void OnClose(QuicDataStream* stream) override; QuicClientSession* session() { return session_.get(); } @@ -194,7 +194,7 @@ class QuicClient : public EpollCallbackInterface, DummyPacketWriterFactory(QuicPacketWriter* writer); virtual ~DummyPacketWriterFactory(); - virtual QuicPacketWriter* Create(QuicConnection* connection) const OVERRIDE; + virtual QuicPacketWriter* Create(QuicConnection* connection) const override; private: QuicPacketWriter* writer_; diff --git a/net/tools/quic/quic_client_session.h b/net/tools/quic/quic_client_session.h index bb64145..5e0624a 100644 --- a/net/tools/quic/quic_client_session.h +++ b/net/tools/quic/quic_client_session.h @@ -30,16 +30,16 @@ class QuicClientSession : public QuicClientSessionBase { // QuicClientSessionBase methods: virtual void OnProofValid( - const QuicCryptoClientConfig::CachedState& cached) OVERRIDE; + const QuicCryptoClientConfig::CachedState& cached) override; virtual void OnProofVerifyDetailsAvailable( - const ProofVerifyDetails& verify_details) OVERRIDE; + const ProofVerifyDetails& verify_details) override; void InitializeSession(const QuicServerId& server_id, QuicCryptoClientConfig* config); // QuicSession methods: - virtual QuicSpdyClientStream* CreateOutgoingDataStream() OVERRIDE; - virtual QuicCryptoClientStream* GetCryptoStream() OVERRIDE; + virtual QuicSpdyClientStream* CreateOutgoingDataStream() override; + virtual QuicCryptoClientStream* GetCryptoStream() override; // Performs a crypto handshake with the server. Returns true if the crypto // handshake is started successfully. @@ -52,7 +52,7 @@ class QuicClientSession : public QuicClientSessionBase { protected: // QuicSession methods: - virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE; + virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) override; private: scoped_ptr<QuicCryptoClientStream> crypto_stream_; diff --git a/net/tools/quic/quic_default_packet_writer.h b/net/tools/quic/quic_default_packet_writer.h index 7b5a36b..47925c3 100644 --- a/net/tools/quic/quic_default_packet_writer.h +++ b/net/tools/quic/quic_default_packet_writer.h @@ -25,10 +25,10 @@ class QuicDefaultPacketWriter : public QuicPacketWriter { virtual WriteResult WritePacket(const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE; - virtual bool IsWriteBlocked() const OVERRIDE; - virtual void SetWritable() OVERRIDE; + const IPEndPoint& peer_address) override; + virtual bool IsWriteBlockedDataBuffered() const override; + virtual bool IsWriteBlocked() const override; + virtual void SetWritable() override; void set_fd(int fd) { fd_ = fd; } diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc index 11272e5..5f0e2da 100644 --- a/net/tools/quic/quic_dispatcher.cc +++ b/net/tools/quic/quic_dispatcher.cc @@ -32,7 +32,7 @@ class DeleteSessionsAlarm : public EpollAlarm { : dispatcher_(dispatcher) { } - virtual int64 OnAlarm() OVERRIDE { + virtual int64 OnAlarm() override { EpollAlarm::OnAlarm(); dispatcher_->DeleteSessions(); return 0; @@ -49,23 +49,23 @@ class QuicDispatcher::QuicFramerVisitor : public QuicFramerVisitorInterface { connection_id_(0) {} // QuicFramerVisitorInterface implementation - virtual void OnPacket() OVERRIDE {} + virtual void OnPacket() override {} virtual bool OnUnauthenticatedPublicHeader( - const QuicPacketPublicHeader& header) OVERRIDE { + const QuicPacketPublicHeader& header) override { connection_id_ = header.connection_id; return dispatcher_->OnUnauthenticatedPublicHeader(header); } virtual bool OnUnauthenticatedHeader( - const QuicPacketHeader& header) OVERRIDE { + const QuicPacketHeader& header) override { dispatcher_->OnUnauthenticatedHeader(header); return false; } - virtual void OnError(QuicFramer* framer) OVERRIDE { + virtual void OnError(QuicFramer* framer) override { DVLOG(1) << QuicUtils::ErrorToString(framer->error()); } virtual bool OnProtocolVersionMismatch( - QuicVersion /*received_version*/) OVERRIDE { + QuicVersion /*received_version*/) override { if (dispatcher_->time_wait_list_manager()->IsConnectionIdInTimeWait( connection_id_)) { // Keep processing after protocol mismatch - this will be dealt with by @@ -82,74 +82,74 @@ class QuicDispatcher::QuicFramerVisitor : public QuicFramerVisitorInterface { // false from OnUnauthenticatedHeader(). As a result, we never process the // payload of the packet. virtual void OnPublicResetPacket( - const QuicPublicResetPacket& /*packet*/) OVERRIDE { + const QuicPublicResetPacket& /*packet*/) override { DCHECK(false); } virtual void OnVersionNegotiationPacket( - const QuicVersionNegotiationPacket& /*packet*/) OVERRIDE { + const QuicVersionNegotiationPacket& /*packet*/) override { DCHECK(false); } - virtual void OnDecryptedPacket(EncryptionLevel level) OVERRIDE { + virtual void OnDecryptedPacket(EncryptionLevel level) override { DCHECK(false); } - virtual bool OnPacketHeader(const QuicPacketHeader& /*header*/) OVERRIDE { + virtual bool OnPacketHeader(const QuicPacketHeader& /*header*/) override { DCHECK(false); return false; } - virtual void OnRevivedPacket() OVERRIDE { + virtual void OnRevivedPacket() override { DCHECK(false); } - virtual void OnFecProtectedPayload(StringPiece /*payload*/) OVERRIDE { + virtual void OnFecProtectedPayload(StringPiece /*payload*/) override { DCHECK(false); } - virtual bool OnStreamFrame(const QuicStreamFrame& /*frame*/) OVERRIDE { + virtual bool OnStreamFrame(const QuicStreamFrame& /*frame*/) override { DCHECK(false); return false; } - virtual bool OnAckFrame(const QuicAckFrame& /*frame*/) OVERRIDE { + virtual bool OnAckFrame(const QuicAckFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnCongestionFeedbackFrame( - const QuicCongestionFeedbackFrame& /*frame*/) OVERRIDE { + const QuicCongestionFeedbackFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnStopWaitingFrame( - const QuicStopWaitingFrame& /*frame*/) OVERRIDE { + const QuicStopWaitingFrame& /*frame*/) override { DCHECK(false); return false; } - virtual bool OnPingFrame(const QuicPingFrame& /*frame*/) OVERRIDE { + virtual bool OnPingFrame(const QuicPingFrame& /*frame*/) override { DCHECK(false); return false; } - virtual bool OnRstStreamFrame(const QuicRstStreamFrame& /*frame*/) OVERRIDE { + virtual bool OnRstStreamFrame(const QuicRstStreamFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnConnectionCloseFrame( - const QuicConnectionCloseFrame & /*frame*/) OVERRIDE { + const QuicConnectionCloseFrame & /*frame*/) override { DCHECK(false); return false; } - virtual bool OnGoAwayFrame(const QuicGoAwayFrame& /*frame*/) OVERRIDE { + virtual bool OnGoAwayFrame(const QuicGoAwayFrame& /*frame*/) override { DCHECK(false); return false; } virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& /*frame*/) - OVERRIDE { + override { DCHECK(false); return false; } - virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE { + virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) override { DCHECK(false); return false; } - virtual void OnFecData(const QuicFecData& /*fec*/) OVERRIDE { + virtual void OnFecData(const QuicFecData& /*fec*/) override { DCHECK(false); } - virtual void OnPacketComplete() OVERRIDE { + virtual void OnPacketComplete() override { DCHECK(false); } diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h index ab8417c..8b0ab6d 100644 --- a/net/tools/quic/quic_dispatcher.h +++ b/net/tools/quic/quic_dispatcher.h @@ -68,7 +68,7 @@ class QuicDispatcher : public QuicServerSessionVisitor, virtual QuicPacketWriter* Create( QuicPacketWriter* writer, - QuicConnection* connection) OVERRIDE; + QuicConnection* connection) override; }; // Ideally we'd have a linked_hash_set: the boolean is unused. @@ -92,7 +92,7 @@ class QuicDispatcher : public QuicServerSessionVisitor, // an existing session, or passing it to the TimeWaitListManager. virtual void ProcessPacket(const IPEndPoint& server_address, const IPEndPoint& client_address, - const QuicEncryptedPacket& packet) OVERRIDE; + const QuicEncryptedPacket& packet) override; // Called when the socket becomes writable to allow queued writes to happen. virtual void OnCanWrite(); @@ -106,11 +106,11 @@ class QuicDispatcher : public QuicServerSessionVisitor, // QuicServerSessionVisitor interface implementation: // Ensure that the closed connection is cleaned up asynchronously. virtual void OnConnectionClosed(QuicConnectionId connection_id, - QuicErrorCode error) OVERRIDE; + QuicErrorCode error) override; // Queues the blocked writer for later resumption. virtual void OnWriteBlocked( - QuicBlockedWriterInterface* blocked_writer) OVERRIDE; + QuicBlockedWriterInterface* blocked_writer) override; typedef base::hash_map<QuicConnectionId, QuicSession*> SessionMap; @@ -193,7 +193,7 @@ class QuicDispatcher : public QuicServerSessionVisitor, PacketWriterFactoryAdapter(QuicDispatcher* dispatcher); virtual ~PacketWriterFactoryAdapter (); - virtual QuicPacketWriter* Create(QuicConnection* connection) const OVERRIDE; + virtual QuicPacketWriter* Create(QuicConnection* connection) const override; private: QuicDispatcher* dispatcher_; diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc index ac6fa70..bcbeb6a 100644 --- a/net/tools/quic/quic_dispatcher_test.cc +++ b/net/tools/quic/quic_dispatcher_test.cc @@ -264,14 +264,14 @@ class BlockingWriter : public QuicPacketWriterWrapper { public: BlockingWriter() : write_blocked_(false) {} - virtual bool IsWriteBlocked() const OVERRIDE { return write_blocked_; } - virtual void SetWritable() OVERRIDE { write_blocked_ = false; } + virtual bool IsWriteBlocked() const override { return write_blocked_; } + virtual void SetWritable() override { write_blocked_ = false; } virtual WriteResult WritePacket( const char* buffer, size_t buf_len, const IPAddressNumber& self_client_address, - const IPEndPoint& peer_client_address) OVERRIDE { + const IPEndPoint& peer_client_address) override { // It would be quite possible to actually implement this method here with // the fake blocked status, but it would be significantly more work in // Chromium, and since it's not called anyway, don't bother. diff --git a/net/tools/quic/quic_epoll_clock.h b/net/tools/quic/quic_epoll_clock.h index d96bff6..4eebefb 100644 --- a/net/tools/quic/quic_epoll_clock.h +++ b/net/tools/quic/quic_epoll_clock.h @@ -24,11 +24,11 @@ class QuicEpollClock : public QuicClock { virtual ~QuicEpollClock(); // Returns the approximate current time as a QuicTime object. - virtual QuicTime ApproximateNow() const OVERRIDE; + virtual QuicTime ApproximateNow() const override; // Returns the current time as a QuicTime object. // Note: this use significant resources please use only if needed. - virtual QuicTime Now() const OVERRIDE; + virtual QuicTime Now() const override; protected: EpollServer* epoll_server_; diff --git a/net/tools/quic/quic_epoll_connection_helper.cc b/net/tools/quic/quic_epoll_connection_helper.cc index 78bfe97..a8321f8 100644 --- a/net/tools/quic/quic_epoll_connection_helper.cc +++ b/net/tools/quic/quic_epoll_connection_helper.cc @@ -28,14 +28,14 @@ class QuicEpollAlarm : public QuicAlarm { epoll_alarm_impl_(this) {} protected: - virtual void SetImpl() OVERRIDE { + virtual void SetImpl() override { DCHECK(deadline().IsInitialized()); epoll_server_->RegisterAlarm( deadline().Subtract(QuicTime::Zero()).ToMicroseconds(), &epoll_alarm_impl_); } - virtual void CancelImpl() OVERRIDE { + virtual void CancelImpl() override { DCHECK(!deadline().IsInitialized()); epoll_alarm_impl_.UnregisterIfRegistered(); } @@ -45,7 +45,7 @@ class QuicEpollAlarm : public QuicAlarm { public: explicit EpollAlarmImpl(QuicEpollAlarm* alarm) : alarm_(alarm) {} - virtual int64 OnAlarm() OVERRIDE { + virtual int64 OnAlarm() override { EpollAlarm::OnAlarm(); alarm_->Fire(); // Fire will take care of registering the alarm, if needed. diff --git a/net/tools/quic/quic_epoll_connection_helper.h b/net/tools/quic/quic_epoll_connection_helper.h index 3198a14..9ca2cf8 100644 --- a/net/tools/quic/quic_epoll_connection_helper.h +++ b/net/tools/quic/quic_epoll_connection_helper.h @@ -36,9 +36,9 @@ class QuicEpollConnectionHelper : public QuicConnectionHelperInterface { virtual ~QuicEpollConnectionHelper(); // QuicEpollConnectionHelperInterface - virtual const QuicClock* GetClock() const OVERRIDE; - virtual QuicRandom* GetRandomGenerator() OVERRIDE; - virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) OVERRIDE; + virtual const QuicClock* GetClock() const override; + virtual QuicRandom* GetRandomGenerator() override; + virtual QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) override; EpollServer* epoll_server() { return epoll_server_; } diff --git a/net/tools/quic/quic_epoll_connection_helper_test.cc b/net/tools/quic/quic_epoll_connection_helper_test.cc index 708bdd4..7234ecf 100644 --- a/net/tools/quic/quic_epoll_connection_helper_test.cc +++ b/net/tools/quic/quic_epoll_connection_helper_test.cc @@ -19,7 +19,7 @@ class TestDelegate : public QuicAlarm::Delegate { public: TestDelegate() : fired_(false) {} - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { fired_ = true; return QuicTime::Zero(); } diff --git a/net/tools/quic/quic_in_memory_cache.cc b/net/tools/quic/quic_in_memory_cache.cc index 6754cf2..c90142c 100644 --- a/net/tools/quic/quic_in_memory_cache.cc +++ b/net/tools/quic/quic_in_memory_cache.cc @@ -29,22 +29,22 @@ namespace { class CachingBalsaVisitor : public NoOpBalsaVisitor { public: CachingBalsaVisitor() : done_framing_(false) {} - virtual void ProcessBodyData(const char* input, size_t size) OVERRIDE { + virtual void ProcessBodyData(const char* input, size_t size) override { AppendToBody(input, size); } - virtual void MessageDone() OVERRIDE { + virtual void MessageDone() override { done_framing_ = true; } - virtual void HandleHeaderError(BalsaFrame* framer) OVERRIDE { + virtual void HandleHeaderError(BalsaFrame* framer) override { UnhandledError(); } - virtual void HandleHeaderWarning(BalsaFrame* framer) OVERRIDE { + virtual void HandleHeaderWarning(BalsaFrame* framer) override { UnhandledError(); } - virtual void HandleChunkingError(BalsaFrame* framer) OVERRIDE { + virtual void HandleChunkingError(BalsaFrame* framer) override { UnhandledError(); } - virtual void HandleBodyError(BalsaFrame* framer) OVERRIDE { + virtual void HandleBodyError(BalsaFrame* framer) override { UnhandledError(); } void UnhandledError() { diff --git a/net/tools/quic/quic_in_memory_cache_test.cc b/net/tools/quic/quic_in_memory_cache_test.cc index 9a75990..98a2b80 100644 --- a/net/tools/quic/quic_in_memory_cache_test.cc +++ b/net/tools/quic/quic_in_memory_cache_test.cc @@ -39,7 +39,7 @@ class QuicInMemoryCacheTest : public ::testing::Test { headers->ReplaceOrAppendHeader("host", host); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { QuicInMemoryCachePeer::ResetForTests(); } diff --git a/net/tools/quic/quic_packet_writer_wrapper.h b/net/tools/quic/quic_packet_writer_wrapper.h index 9dafe77..a4db367 100644 --- a/net/tools/quic/quic_packet_writer_wrapper.h +++ b/net/tools/quic/quic_packet_writer_wrapper.h @@ -27,10 +27,10 @@ class QuicPacketWriterWrapper : public net::QuicPacketWriter { const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE; - virtual bool IsWriteBlocked() const OVERRIDE; - virtual void SetWritable() OVERRIDE; + const IPEndPoint& peer_address) override; + virtual bool IsWriteBlockedDataBuffered() const override; + virtual bool IsWriteBlocked() const override; + virtual void SetWritable() override; // Takes ownership of |writer|. void set_writer(QuicPacketWriter* writer); diff --git a/net/tools/quic/quic_per_connection_packet_writer.h b/net/tools/quic/quic_per_connection_packet_writer.h index a442a9a..390e43d 100644 --- a/net/tools/quic/quic_per_connection_packet_writer.h +++ b/net/tools/quic/quic_per_connection_packet_writer.h @@ -29,10 +29,10 @@ class QuicPerConnectionPacketWriter : public QuicPacketWriter { virtual WriteResult WritePacket(const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; - virtual bool IsWriteBlockedDataBuffered() const OVERRIDE; - virtual bool IsWriteBlocked() const OVERRIDE; - virtual void SetWritable() OVERRIDE; + const IPEndPoint& peer_address) override; + virtual bool IsWriteBlockedDataBuffered() const override; + virtual bool IsWriteBlocked() const override; + virtual void SetWritable() override; private: QuicPacketWriter* shared_writer_; // Not owned. diff --git a/net/tools/quic/quic_server.h b/net/tools/quic/quic_server.h index 87c8bc7..a027a49 100644 --- a/net/tools/quic/quic_server.h +++ b/net/tools/quic/quic_server.h @@ -47,10 +47,10 @@ class QuicServer : public EpollCallbackInterface { // From EpollCallbackInterface virtual void OnRegistration(EpollServer* eps, int fd, - int event_mask) OVERRIDE {} - virtual void OnModification(int fd, int event_mask) OVERRIDE {} - virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE; - virtual void OnUnregistration(int fd, bool replaced) OVERRIDE {} + int event_mask) override {} + virtual void OnModification(int fd, int event_mask) override {} + virtual void OnEvent(int fd, EpollEvent* event) override; + virtual void OnUnregistration(int fd, bool replaced) override {} // Reads a packet from the given fd, and then passes it off to // the QuicDispatcher. Returns true if a packet is read, false @@ -62,7 +62,7 @@ class QuicServer : public EpollCallbackInterface { ProcessPacketInterface* processor, uint32* packets_dropped); - virtual void OnShutdown(EpollServer* eps, int fd) OVERRIDE {} + virtual void OnShutdown(EpollServer* eps, int fd) override {} void SetStrikeRegisterNoStartupPeriod() { crypto_config_.set_strike_register_no_startup_period(); diff --git a/net/tools/quic/quic_server_session.h b/net/tools/quic/quic_server_session.h index 87f82d9..eb0aab6 100644 --- a/net/tools/quic/quic_server_session.h +++ b/net/tools/quic/quic_server_session.h @@ -50,12 +50,12 @@ class QuicServerSession : public QuicSession { QuicServerSessionVisitor* visitor); // Override the base class to notify the owner of the connection close. - virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE; - virtual void OnWriteBlocked() OVERRIDE; + virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) override; + virtual void OnWriteBlocked() override; // Sends a server config update to the client, containing new bandwidth // estimate. - virtual void OnCongestionWindowChange(QuicTime now) OVERRIDE; + virtual void OnCongestionWindowChange(QuicTime now) override; virtual ~QuicServerSession(); @@ -66,7 +66,7 @@ class QuicServerSession : public QuicSession { } // Override base class to process FEC config received from client. - virtual void OnConfigNegotiated() OVERRIDE; + virtual void OnConfigNegotiated() override; void set_serving_region(string serving_region) { serving_region_ = serving_region; @@ -74,9 +74,9 @@ class QuicServerSession : public QuicSession { protected: // QuicSession methods: - virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE; - virtual QuicDataStream* CreateOutgoingDataStream() OVERRIDE; - virtual QuicCryptoServerStream* GetCryptoStream() OVERRIDE; + virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) override; + virtual QuicDataStream* CreateOutgoingDataStream() override; + virtual QuicCryptoServerStream* GetCryptoStream() override; // If we should create an incoming stream, returns true. Otherwise // does error handling, including communicating the error to the client and diff --git a/net/tools/quic/quic_spdy_client_stream.h b/net/tools/quic/quic_spdy_client_stream.h index 7bbdee6..8274164 100644 --- a/net/tools/quic/quic_spdy_client_stream.h +++ b/net/tools/quic/quic_spdy_client_stream.h @@ -32,16 +32,16 @@ class QuicSpdyClientStream : public QuicDataStream { // Override the base class to close the write side as soon as we get a // response. // SPDY/HTTP does not support bidirectional streaming. - virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE; + virtual void OnStreamFrame(const QuicStreamFrame& frame) override; // Override the base class to store the size of the headers. - virtual void OnStreamHeadersComplete(bool fin, size_t frame_len) OVERRIDE; + virtual void OnStreamHeadersComplete(bool fin, size_t frame_len) override; // ReliableQuicStream implementation called by the session when there's // data for us. - virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE; + virtual uint32 ProcessData(const char* data, uint32 data_len) override; - virtual void OnFinRead() OVERRIDE; + virtual void OnFinRead() override; // Serializes the headers and body, sends it to the server, and // returns the number of bytes sent. diff --git a/net/tools/quic/quic_spdy_server_stream.h b/net/tools/quic/quic_spdy_server_stream.h index c8167d1..4c2cb41 100644 --- a/net/tools/quic/quic_spdy_server_stream.h +++ b/net/tools/quic/quic_spdy_server_stream.h @@ -32,8 +32,8 @@ class QuicSpdyServerStream : public QuicDataStream { // ReliableQuicStream implementation called by the session when there's // data for us. - virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE; - virtual void OnFinRead() OVERRIDE; + virtual uint32 ProcessData(const char* data, uint32 data_len) override; + virtual void OnFinRead() override; void ParseRequestHeaders(); diff --git a/net/tools/quic/quic_spdy_server_stream_test.cc b/net/tools/quic/quic_spdy_server_stream_test.cc index f5bd17f..4f5484a 100644 --- a/net/tools/quic/quic_spdy_server_stream_test.cc +++ b/net/tools/quic/quic_spdy_server_stream_test.cc @@ -97,7 +97,7 @@ class QuicSpdyServerStreamTest : public ::testing::TestWithParam<QuicVersion> { QuicInMemoryCachePeer::ResetForTests(); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { QuicInMemoryCache* cache = QuicInMemoryCache::GetInstance(); BalsaHeaders request_headers, response_headers; diff --git a/net/tools/quic/quic_time_wait_list_manager.cc b/net/tools/quic/quic_time_wait_list_manager.cc index 9744ff8..f99bf3f 100644 --- a/net/tools/quic/quic_time_wait_list_manager.cc +++ b/net/tools/quic/quic_time_wait_list_manager.cc @@ -43,7 +43,7 @@ class ConnectionIdCleanUpAlarm : public EpollAlarm { : time_wait_list_manager_(time_wait_list_manager) { } - virtual int64 OnAlarm() OVERRIDE { + virtual int64 OnAlarm() override { EpollAlarm::OnAlarm(); time_wait_list_manager_->CleanUpOldConnectionIds(); // Let the time wait manager register the alarm at appropriate time. diff --git a/net/tools/quic/quic_time_wait_list_manager.h b/net/tools/quic/quic_time_wait_list_manager.h index 1af9d56..d9a5f92 100644 --- a/net/tools/quic/quic_time_wait_list_manager.h +++ b/net/tools/quic/quic_time_wait_list_manager.h @@ -83,7 +83,7 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface { // Called by the dispatcher when the underlying socket becomes writable again, // since we might need to send pending public reset packets which we didn't // send because the underlying socket was write blocked. - virtual void OnCanWrite() OVERRIDE; + virtual void OnCanWrite() override; // Used to delete connection_id entries that have outlived their time wait // period. diff --git a/net/tools/quic/quic_time_wait_list_manager_test.cc b/net/tools/quic/quic_time_wait_list_manager_test.cc index 5e964d6..335b22c 100644 --- a/net/tools/quic/quic_time_wait_list_manager_test.cc +++ b/net/tools/quic/quic_time_wait_list_manager_test.cc @@ -45,10 +45,10 @@ namespace test { class FramerVisitorCapturingPublicReset : public NoOpFramerVisitor { public: FramerVisitorCapturingPublicReset() {} - virtual ~FramerVisitorCapturingPublicReset() OVERRIDE {} + virtual ~FramerVisitorCapturingPublicReset() override {} virtual void OnPublicResetPacket( - const QuicPublicResetPacket& public_reset) OVERRIDE { + const QuicPublicResetPacket& public_reset) override { public_reset_packet_ = public_reset; } @@ -96,9 +96,9 @@ class QuicTimeWaitListManagerTest : public ::testing::Test { client_address_(net::test::TestPeerIPAddress(), kTestPort), writer_is_blocked_(false) {} - virtual ~QuicTimeWaitListManagerTest() OVERRIDE {} + virtual ~QuicTimeWaitListManagerTest() override {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { EXPECT_CALL(writer_, IsWriteBlocked()) .WillRepeatedly(ReturnPointee(&writer_is_blocked_)); EXPECT_CALL(writer_, IsWriteBlockedDataBuffered()) @@ -181,7 +181,7 @@ class ValidatePublicResetPacketPredicate virtual bool MatchAndExplain( const std::tr1::tuple<const char*, int> packet_buffer, - testing::MatchResultListener* /* listener */) const OVERRIDE { + testing::MatchResultListener* /* listener */) const override { FramerVisitorCapturingPublicReset visitor; QuicFramer framer(QuicSupportedVersions(), QuicTime::Zero(), @@ -198,9 +198,9 @@ class ValidatePublicResetPacketPredicate kTestPort == packet.client_address.port(); } - virtual void DescribeTo(::std::ostream* os) const OVERRIDE {} + virtual void DescribeTo(::std::ostream* os) const override {} - virtual void DescribeNegationTo(::std::ostream* os) const OVERRIDE {} + virtual void DescribeNegationTo(::std::ostream* os) const override {} private: QuicConnectionId connection_id_; diff --git a/net/tools/quic/test_tools/mock_epoll_server.h b/net/tools/quic/test_tools/mock_epoll_server.h index cdb6a36..b3b312e 100644 --- a/net/tools/quic/test_tools/mock_epoll_server.h +++ b/net/tools/quic/test_tools/mock_epoll_server.h @@ -22,7 +22,7 @@ class FakeTimeEpollServer : public EpollServer { virtual ~FakeTimeEpollServer(); // Replaces the EpollServer NowInUsec. - virtual int64 NowInUsec() const OVERRIDE; + virtual int64 NowInUsec() const override; void set_now_in_usec(int64 nius) { now_in_usec_ = nius; } @@ -85,16 +85,16 @@ class MockEpollServer : public FakeTimeEpollServer { protected: // functions // These functions do nothing here, as we're not actually // using the epoll_* syscalls. - virtual void DelFD(int fd) const OVERRIDE {} - virtual void AddFD(int fd, int event_mask) const OVERRIDE {} - virtual void ModFD(int fd, int event_mask) const OVERRIDE {} + virtual void DelFD(int fd) const override {} + virtual void AddFD(int fd, int event_mask) const override {} + virtual void ModFD(int fd, int event_mask) const override {} // Replaces the epoll_server's epoll_wait_impl. virtual int epoll_wait_impl(int epfd, struct epoll_event* events, int max_events, - int timeout_in_ms) OVERRIDE; - virtual void SetNonblocking (int fd) OVERRIDE {} + int timeout_in_ms) override; + virtual void SetNonblocking (int fd) override {} private: // members EventQueue event_queue_; diff --git a/net/tools/quic/test_tools/packet_dropping_test_writer.cc b/net/tools/quic/test_tools/packet_dropping_test_writer.cc index c7202d6..2571868 100644 --- a/net/tools/quic/test_tools/packet_dropping_test_writer.cc +++ b/net/tools/quic/test_tools/packet_dropping_test_writer.cc @@ -21,7 +21,7 @@ class WriteUnblockedAlarm : public QuicAlarm::Delegate { explicit WriteUnblockedAlarm(PacketDroppingTestWriter* writer) : writer_(writer) {} - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { DVLOG(1) << "Unblocking socket."; writer_->OnCanWrite(); return QuicTime::Zero(); @@ -37,7 +37,7 @@ class DelayAlarm : public QuicAlarm::Delegate { public: explicit DelayAlarm(PacketDroppingTestWriter* writer) : writer_(writer) {} - virtual QuicTime OnAlarm() OVERRIDE { + virtual QuicTime OnAlarm() override { return writer_->ReleaseOldPackets(); } diff --git a/net/tools/quic/test_tools/packet_dropping_test_writer.h b/net/tools/quic/test_tools/packet_dropping_test_writer.h index b7babad..29a21a8 100644 --- a/net/tools/quic/test_tools/packet_dropping_test_writer.h +++ b/net/tools/quic/test_tools/packet_dropping_test_writer.h @@ -49,11 +49,11 @@ class PacketDroppingTestWriter : public QuicPacketWriterWrapper { const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; + const IPEndPoint& peer_address) override; - virtual bool IsWriteBlocked() const OVERRIDE; + virtual bool IsWriteBlocked() const override; - virtual void SetWritable() OVERRIDE; + virtual void SetWritable() override; // Writes out any packet which should have been sent by now // to the contained writer and returns the time diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc index 68b8698..d53958d 100644 --- a/net/tools/quic/test_tools/quic_test_client.cc +++ b/net/tools/quic/test_tools/quic_test_client.cc @@ -49,7 +49,7 @@ class RecordingProofVerifier : public ProofVerifier { const ProofVerifyContext* context, string* error_details, scoped_ptr<ProofVerifyDetails>* details, - ProofVerifierCallback* callback) OVERRIDE { + ProofVerifierCallback* callback) override { common_name_.clear(); if (certs.empty()) { return QUIC_FAILURE; diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h index 7ae3b74..c9fd22e 100644 --- a/net/tools/quic/test_tools/quic_test_client.h +++ b/net/tools/quic/test_tools/quic_test_client.h @@ -45,9 +45,9 @@ class MockableQuicClient : public QuicClient { const QuicVersionVector& supported_versions, EpollServer* epoll_server); - virtual ~MockableQuicClient() OVERRIDE; - virtual QuicPacketWriter* CreateQuicPacketWriter() OVERRIDE; - virtual QuicConnectionId GenerateConnectionId() OVERRIDE; + virtual ~MockableQuicClient() override; + virtual QuicPacketWriter* CreateQuicPacketWriter() override; + virtual QuicConnectionId GenerateConnectionId() override; void UseWriter(QuicPacketWriterWrapper* writer); void UseConnectionId(QuicConnectionId connection_id); @@ -91,45 +91,45 @@ class QuicTestClient : public SimpleClient, // From SimpleClient // Clears any outstanding state and sends a simple GET of 'uri' to the // server. Returns 0 if the request failed and no bytes were written. - virtual ssize_t SendRequest(const string& uri) OVERRIDE; - virtual ssize_t SendMessage(const HTTPMessage& message) OVERRIDE; + virtual ssize_t SendRequest(const string& uri) override; + virtual ssize_t SendMessage(const HTTPMessage& message) override; virtual string SendCustomSynchronousRequest( - const HTTPMessage& message) OVERRIDE; - virtual string SendSynchronousRequest(const string& uri) OVERRIDE; - virtual void Connect() OVERRIDE; - virtual void ResetConnection() OVERRIDE; - virtual void Disconnect() OVERRIDE; - virtual IPEndPoint LocalSocketAddress() const OVERRIDE; - virtual void ClearPerRequestState() OVERRIDE; - virtual void WaitForResponseForMs(int timeout_ms) OVERRIDE; - virtual void WaitForInitialResponseForMs(int timeout_ms) OVERRIDE; - virtual ssize_t Send(const void *buffer, size_t size) OVERRIDE; - virtual bool response_complete() const OVERRIDE; - virtual bool response_headers_complete() const OVERRIDE; - virtual const BalsaHeaders* response_headers() const OVERRIDE; - virtual int64 response_size() const OVERRIDE; - virtual int response_header_size() const OVERRIDE; - virtual int64 response_body_size() const OVERRIDE; - virtual size_t bytes_read() const OVERRIDE; - virtual size_t bytes_written() const OVERRIDE; - virtual bool buffer_body() const OVERRIDE; - virtual void set_buffer_body(bool buffer_body) OVERRIDE; - virtual bool ServerInLameDuckMode() const OVERRIDE; - virtual const string& response_body() OVERRIDE; - virtual bool connected() const OVERRIDE; + const HTTPMessage& message) override; + virtual string SendSynchronousRequest(const string& uri) override; + virtual void Connect() override; + virtual void ResetConnection() override; + virtual void Disconnect() override; + virtual IPEndPoint LocalSocketAddress() const override; + virtual void ClearPerRequestState() override; + virtual void WaitForResponseForMs(int timeout_ms) override; + virtual void WaitForInitialResponseForMs(int timeout_ms) override; + virtual ssize_t Send(const void *buffer, size_t size) override; + virtual bool response_complete() const override; + virtual bool response_headers_complete() const override; + virtual const BalsaHeaders* response_headers() const override; + virtual int64 response_size() const override; + virtual int response_header_size() const override; + virtual int64 response_body_size() const override; + virtual size_t bytes_read() const override; + virtual size_t bytes_written() const override; + virtual bool buffer_body() const override; + virtual void set_buffer_body(bool buffer_body) override; + virtual bool ServerInLameDuckMode() const override; + virtual const string& response_body() override; + virtual bool connected() const override; // These functions are all unimplemented functions from SimpleClient, and log // DFATAL if called by users of SimpleClient. virtual ssize_t SendAndWaitForResponse(const void *buffer, - size_t size) OVERRIDE; - virtual void Bind(IPEndPoint* local_address) OVERRIDE; - virtual string SerializeMessage(const HTTPMessage& message) OVERRIDE; - virtual IPAddressNumber bind_to_address() const OVERRIDE; - virtual void set_bind_to_address(IPAddressNumber address) OVERRIDE; - virtual const IPEndPoint& address() const OVERRIDE; - virtual size_t requests_sent() const OVERRIDE; + size_t size) override; + virtual void Bind(IPEndPoint* local_address) override; + virtual string SerializeMessage(const HTTPMessage& message) override; + virtual IPAddressNumber bind_to_address() const override; + virtual void set_bind_to_address(IPAddressNumber address) override; + virtual const IPEndPoint& address() const override; + virtual size_t requests_sent() const override; // From QuicDataStream::Visitor - virtual void OnClose(QuicDataStream* stream) OVERRIDE; + virtual void OnClose(QuicDataStream* stream) override; // Configures client_ to take ownership of and use the writer. // Must be called before initial connect. diff --git a/net/tools/quic/test_tools/quic_test_utils.cc b/net/tools/quic/test_tools/quic_test_utils.cc index 8fdbe001..781b3c3 100644 --- a/net/tools/quic/test_tools/quic_test_utils.cc +++ b/net/tools/quic/test_tools/quic_test_utils.cc @@ -26,7 +26,7 @@ class NiceMockPacketWriterFactory virtual ~NiceMockPacketWriterFactory() {} virtual QuicPacketWriter* Create( - QuicConnection* /*connection*/) const OVERRIDE { + QuicConnection* /*connection*/) const override { return new testing::NiceMock<MockPacketWriter>(); } diff --git a/net/tools/quic/test_tools/quic_test_utils.h b/net/tools/quic/test_tools/quic_test_utils.h index 1211ff2..dc70e69 100644 --- a/net/tools/quic/test_tools/quic_test_utils.h +++ b/net/tools/quic/test_tools/quic_test_utils.h @@ -104,7 +104,7 @@ class TestSession : public QuicSession { void SetCryptoStream(QuicCryptoStream* stream); - virtual QuicCryptoStream* GetCryptoStream() OVERRIDE; + virtual QuicCryptoStream* GetCryptoStream() override; private: QuicCryptoStream* crypto_stream_; @@ -169,7 +169,7 @@ class TestWriterFactory : public QuicDispatcher::PacketWriterFactory { virtual ~TestWriterFactory(); virtual QuicPacketWriter* Create(QuicPacketWriter* writer, - QuicConnection* connection) OVERRIDE; + QuicConnection* connection) override; // Calls OnPacketSent on the last QuicConnection to write through one of the // packet writers created by this factory. @@ -187,7 +187,7 @@ class TestWriterFactory : public QuicDispatcher::PacketWriterFactory { const char* buffer, size_t buf_len, const IPAddressNumber& self_address, - const IPEndPoint& peer_address) OVERRIDE; + const IPEndPoint& peer_address) override; private: TestWriterFactory* factory_; diff --git a/net/tools/quic/test_tools/server_thread.h b/net/tools/quic/test_tools/server_thread.h index 6066d97..cb92b01 100644 --- a/net/tools/quic/test_tools/server_thread.h +++ b/net/tools/quic/test_tools/server_thread.h @@ -28,7 +28,7 @@ class ServerThread : public base::SimpleThread { void Initialize(); // Runs the event loop. Will initialize if necessary. - virtual void Run() OVERRIDE; + virtual void Run() override; // Waits for the handshake to be confirmed for the first session created. void WaitForCryptoHandshakeConfirmed(); diff --git a/net/udp/udp_client_socket.h b/net/udp/udp_client_socket.h index c5fc8c0..d689640 100644 --- a/net/udp/udp_client_socket.h +++ b/net/udp/udp_client_socket.h @@ -24,17 +24,17 @@ class NET_EXPORT_PRIVATE UDPClientSocket : public DatagramClientSocket { virtual ~UDPClientSocket(); // DatagramClientSocket implementation. - virtual int Connect(const IPEndPoint& address) OVERRIDE; + virtual int Connect(const IPEndPoint& address) override; virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void Close() OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Close() override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; + virtual const BoundNetLog& NetLog() const override; private: UDPSocket socket_; diff --git a/net/udp/udp_server_socket.h b/net/udp/udp_server_socket.h index 4ce7354..9801ff8 100644 --- a/net/udp/udp_server_socket.h +++ b/net/udp/udp_server_socket.h @@ -22,30 +22,30 @@ class NET_EXPORT UDPServerSocket : public DatagramServerSocket { virtual ~UDPServerSocket(); // Implement DatagramServerSocket: - virtual int Listen(const IPEndPoint& address) OVERRIDE; + virtual int Listen(const IPEndPoint& address) override; virtual int RecvFrom(IOBuffer* buf, int buf_len, IPEndPoint* address, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int SendTo(IOBuffer* buf, int buf_len, const IPEndPoint& address, - const CompletionCallback& callback) OVERRIDE; - virtual int SetReceiveBufferSize(int32 size) OVERRIDE; - virtual int SetSendBufferSize(int32 size) OVERRIDE; - virtual void Close() OVERRIDE; - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; - virtual const BoundNetLog& NetLog() const OVERRIDE; - virtual void AllowAddressReuse() OVERRIDE; - virtual void AllowBroadcast() OVERRIDE; - virtual int JoinGroup(const IPAddressNumber& group_address) const OVERRIDE; - virtual int LeaveGroup(const IPAddressNumber& group_address) const OVERRIDE; - virtual int SetMulticastInterface(uint32 interface_index) OVERRIDE; - virtual int SetMulticastTimeToLive(int time_to_live) OVERRIDE; - virtual int SetMulticastLoopbackMode(bool loopback) OVERRIDE; - virtual int SetDiffServCodePoint(DiffServCodePoint dscp) OVERRIDE; - virtual void DetachFromThread() OVERRIDE; + const CompletionCallback& callback) override; + virtual int SetReceiveBufferSize(int32 size) override; + virtual int SetSendBufferSize(int32 size) override; + virtual void Close() override; + virtual int GetPeerAddress(IPEndPoint* address) const override; + virtual int GetLocalAddress(IPEndPoint* address) const override; + virtual const BoundNetLog& NetLog() const override; + virtual void AllowAddressReuse() override; + virtual void AllowBroadcast() override; + virtual int JoinGroup(const IPAddressNumber& group_address) const override; + virtual int LeaveGroup(const IPAddressNumber& group_address) const override; + virtual int SetMulticastInterface(uint32 interface_index) override; + virtual int SetMulticastTimeToLive(int time_to_live) override; + virtual int SetMulticastLoopbackMode(bool loopback) override; + virtual int SetDiffServCodePoint(DiffServCodePoint dscp) override; + virtual void DetachFromThread() override; private: UDPSocket socket_; diff --git a/net/udp/udp_socket_libevent.h b/net/udp/udp_socket_libevent.h index 69e8ba3..292a42f 100644 --- a/net/udp/udp_socket_libevent.h +++ b/net/udp/udp_socket_libevent.h @@ -179,9 +179,9 @@ class NET_EXPORT UDPSocketLibevent : public base::NonThreadSafe { // MessageLoopForIO::Watcher methods - virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int /* fd */) override; - virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {} + virtual void OnFileCanWriteWithoutBlocking(int /* fd */) override {} private: UDPSocketLibevent* const socket_; @@ -195,9 +195,9 @@ class NET_EXPORT UDPSocketLibevent : public base::NonThreadSafe { // MessageLoopForIO::Watcher methods - virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE {} + virtual void OnFileCanReadWithoutBlocking(int /* fd */) override {} - virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE; + virtual void OnFileCanWriteWithoutBlocking(int /* fd */) override; private: UDPSocketLibevent* const socket_; diff --git a/net/url_request/data_protocol_handler.h b/net/url_request/data_protocol_handler.h index b7f7fef..3c2c4d4 100644 --- a/net/url_request/data_protocol_handler.h +++ b/net/url_request/data_protocol_handler.h @@ -19,8 +19,8 @@ class NET_EXPORT DataProtocolHandler public: DataProtocolHandler(); virtual URLRequestJob* MaybeCreateJob( - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE; - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; + URLRequest* request, NetworkDelegate* network_delegate) const override; + virtual bool IsSafeRedirectTarget(const GURL& location) const override; private: DISALLOW_COPY_AND_ASSIGN(DataProtocolHandler); diff --git a/net/url_request/file_protocol_handler.h b/net/url_request/file_protocol_handler.h index 78956a9..02b5c9fc 100644 --- a/net/url_request/file_protocol_handler.h +++ b/net/url_request/file_protocol_handler.h @@ -30,8 +30,8 @@ class NET_EXPORT FileProtocolHandler : const scoped_refptr<base::TaskRunner>& file_task_runner); virtual ~FileProtocolHandler(); virtual URLRequestJob* MaybeCreateJob( - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE; - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; + URLRequest* request, NetworkDelegate* network_delegate) const override; + virtual bool IsSafeRedirectTarget(const GURL& location) const override; private: const scoped_refptr<base::TaskRunner> file_task_runner_; diff --git a/net/url_request/ftp_protocol_handler.h b/net/url_request/ftp_protocol_handler.h index 7c2278a..c3091b9 100644 --- a/net/url_request/ftp_protocol_handler.h +++ b/net/url_request/ftp_protocol_handler.h @@ -24,7 +24,7 @@ class NET_EXPORT FtpProtocolHandler : explicit FtpProtocolHandler(FtpTransactionFactory* ftp_transaction_factory); virtual ~FtpProtocolHandler(); virtual URLRequestJob* MaybeCreateJob( - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE; + URLRequest* request, NetworkDelegate* network_delegate) const override; private: friend class FtpTestURLRequestContext; diff --git a/net/url_request/static_http_user_agent_settings.h b/net/url_request/static_http_user_agent_settings.h index 7406abc..4edb948 100644 --- a/net/url_request/static_http_user_agent_settings.h +++ b/net/url_request/static_http_user_agent_settings.h @@ -23,8 +23,8 @@ class NET_EXPORT StaticHttpUserAgentSettings : public HttpUserAgentSettings { virtual ~StaticHttpUserAgentSettings(); // HttpUserAgentSettings implementation - virtual std::string GetAcceptLanguage() const OVERRIDE; - virtual std::string GetUserAgent() const OVERRIDE; + virtual std::string GetAcceptLanguage() const override; + virtual std::string GetUserAgent() const override; private: const std::string accept_language_; diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h index 5d4f3d9..c004ce7 100644 --- a/net/url_request/test_url_fetcher_factory.h +++ b/net/url_request/test_url_fetcher_factory.h @@ -88,66 +88,66 @@ class TestURLFetcher : public URLFetcher { // URLFetcher implementation virtual void SetUploadData(const std::string& upload_content_type, - const std::string& upload_content) OVERRIDE; + const std::string& upload_content) override; virtual void SetUploadFilePath( const std::string& upload_content_type, const base::FilePath& file_path, uint64 range_offset, uint64 range_length, - scoped_refptr<base::TaskRunner> file_task_runner) OVERRIDE; + scoped_refptr<base::TaskRunner> file_task_runner) override; virtual void SetChunkedUpload( - const std::string& upload_content_type) OVERRIDE; + const std::string& upload_content_type) override; // Overriden to cache the chunks uploaded. Caller can read back the uploaded // chunks with the upload_chunks() accessor. virtual void AppendChunkToUpload(const std::string& data, - bool is_last_chunk) OVERRIDE; - virtual void SetLoadFlags(int load_flags) OVERRIDE; - virtual int GetLoadFlags() const OVERRIDE; - virtual void SetReferrer(const std::string& referrer) OVERRIDE; + bool is_last_chunk) override; + virtual void SetLoadFlags(int load_flags) override; + virtual int GetLoadFlags() const override; + virtual void SetReferrer(const std::string& referrer) override; virtual void SetReferrerPolicy( - URLRequest::ReferrerPolicy referrer_policy) OVERRIDE; + URLRequest::ReferrerPolicy referrer_policy) override; virtual void SetExtraRequestHeaders( - const std::string& extra_request_headers) OVERRIDE; - virtual void AddExtraRequestHeader(const std::string& header_line) OVERRIDE; + const std::string& extra_request_headers) override; + virtual void AddExtraRequestHeader(const std::string& header_line) override; virtual void SetRequestContext( - URLRequestContextGetter* request_context_getter) OVERRIDE; + URLRequestContextGetter* request_context_getter) override; virtual void SetFirstPartyForCookies( - const GURL& first_party_for_cookies) OVERRIDE; + const GURL& first_party_for_cookies) override; virtual void SetURLRequestUserData( const void* key, - const CreateDataCallback& create_data_callback) OVERRIDE; - virtual void SetStopOnRedirect(bool stop_on_redirect) OVERRIDE; - virtual void SetAutomaticallyRetryOn5xx(bool retry) OVERRIDE; - virtual void SetMaxRetriesOn5xx(int max_retries) OVERRIDE; - virtual int GetMaxRetriesOn5xx() const OVERRIDE; - virtual base::TimeDelta GetBackoffDelay() const OVERRIDE; - virtual void SetAutomaticallyRetryOnNetworkChanges(int max_retries) OVERRIDE; + const CreateDataCallback& create_data_callback) override; + virtual void SetStopOnRedirect(bool stop_on_redirect) override; + virtual void SetAutomaticallyRetryOn5xx(bool retry) override; + virtual void SetMaxRetriesOn5xx(int max_retries) override; + virtual int GetMaxRetriesOn5xx() const override; + virtual base::TimeDelta GetBackoffDelay() const override; + virtual void SetAutomaticallyRetryOnNetworkChanges(int max_retries) override; virtual void SaveResponseToFileAtPath( const base::FilePath& file_path, - scoped_refptr<base::SequencedTaskRunner> file_task_runner) OVERRIDE; + scoped_refptr<base::SequencedTaskRunner> file_task_runner) override; virtual void SaveResponseToTemporaryFile( - scoped_refptr<base::SequencedTaskRunner> file_task_runner) OVERRIDE; + scoped_refptr<base::SequencedTaskRunner> file_task_runner) override; virtual void SaveResponseWithWriter( - scoped_ptr<URLFetcherResponseWriter> response_writer) OVERRIDE; - virtual HttpResponseHeaders* GetResponseHeaders() const OVERRIDE; - virtual HostPortPair GetSocketAddress() const OVERRIDE; - virtual bool WasFetchedViaProxy() const OVERRIDE; - virtual void Start() OVERRIDE; + scoped_ptr<URLFetcherResponseWriter> response_writer) override; + virtual HttpResponseHeaders* GetResponseHeaders() const override; + virtual HostPortPair GetSocketAddress() const override; + virtual bool WasFetchedViaProxy() const override; + virtual void Start() override; // URL we were created with. Because of how we're using URLFetcher GetURL() // always returns an empty URL. Chances are you'll want to use // GetOriginalURL() in your tests. - virtual const GURL& GetOriginalURL() const OVERRIDE; - virtual const GURL& GetURL() const OVERRIDE; - virtual const URLRequestStatus& GetStatus() const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; - virtual const ResponseCookies& GetCookies() const OVERRIDE; - virtual void ReceivedContentWasMalformed() OVERRIDE; + virtual const GURL& GetOriginalURL() const override; + virtual const GURL& GetURL() const override; + virtual const URLRequestStatus& GetStatus() const override; + virtual int GetResponseCode() const override; + virtual const ResponseCookies& GetCookies() const override; + virtual void ReceivedContentWasMalformed() override; // Override response access functions to return fake data. virtual bool GetResponseAsString( - std::string* out_response_string) const OVERRIDE; + std::string* out_response_string) const override; virtual bool GetResponseAsFilePath( - bool take_ownership, base::FilePath* out_response_path) const OVERRIDE; + bool take_ownership, base::FilePath* out_response_path) const override; void GetExtraRequestHeaders(HttpRequestHeaders* headers) const; @@ -247,7 +247,7 @@ class TestURLFetcherFactory : public URLFetcherFactory, int id, const GURL& url, URLFetcher::RequestType request_type, - URLFetcherDelegate* d) OVERRIDE; + URLFetcherDelegate* d) override; TestURLFetcher* GetFetcherByID(int id) const; void RemoveFetcherFromMap(int id); void SetDelegateForTests(TestURLFetcherDelegateForTests* delegate_for_tests); @@ -299,9 +299,9 @@ class FakeURLFetcher : public TestURLFetcher { // Start the request. This will call the given delegate asynchronously // with the pre-baked response as parameter. - virtual void Start() OVERRIDE; + virtual void Start() override; - virtual const GURL& GetURL() const OVERRIDE; + virtual const GURL& GetURL() const override; virtual ~FakeURLFetcher(); @@ -407,7 +407,7 @@ class FakeURLFetcherFactory : public URLFetcherFactory, int id, const GURL& url, URLFetcher::RequestType request_type, - URLFetcherDelegate* d) OVERRIDE; + URLFetcherDelegate* d) override; // Sets the fake response for a given URL. The |response_data| may be empty. // The |response_code| may be any HttpStatusCode. For instance, HTTP_OK will @@ -460,7 +460,7 @@ class URLFetcherImplFactory : public URLFetcherFactory { int id, const GURL& url, URLFetcher::RequestType request_type, - URLFetcherDelegate* d) OVERRIDE; + URLFetcherDelegate* d) override; }; } // namespace net diff --git a/net/url_request/test_url_request_interceptor.cc b/net/url_request/test_url_request_interceptor.cc index 69235d6..ec60e08 100644 --- a/net/url_request/test_url_request_interceptor.cc +++ b/net/url_request/test_url_request_interceptor.cc @@ -30,7 +30,7 @@ class TestURLRequestJob : public net::URLRequestFileJob { file_path, worker_task_runner) {} - virtual int GetResponseCode() const OVERRIDE { return 200; } + virtual int GetResponseCode() const override { return 200; } private: virtual ~TestURLRequestJob() {} @@ -93,7 +93,7 @@ class TestURLRequestInterceptor::Delegate : public net::URLRequestInterceptor { // When computing matches, this ignores the query parameters of the url. virtual net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const OVERRIDE { + net::NetworkDelegate* network_delegate) const override { DCHECK(network_task_runner_->RunsTasksOnCurrentThread()); if (request->url().scheme() != scheme_ || request->url().host() != hostname_) { diff --git a/net/url_request/url_fetcher_core.h b/net/url_request/url_fetcher_core.h index a69eb71..c064a42 100644 --- a/net/url_request/url_fetcher_core.h +++ b/net/url_request/url_fetcher_core.h @@ -124,13 +124,13 @@ class URLFetcherCore // Overridden from URLRequest::Delegate: virtual void OnReceivedRedirect(URLRequest* request, const RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE; - virtual void OnResponseStarted(URLRequest* request) OVERRIDE; + bool* defer_redirect) override; + virtual void OnResponseStarted(URLRequest* request) override; virtual void OnReadCompleted(URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; virtual void OnCertificateRequested( URLRequest* request, - SSLCertRequestInfo* cert_request_info) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; URLFetcherDelegate* delegate() const { return delegate_; } static void CancelAll(); diff --git a/net/url_request/url_fetcher_impl.h b/net/url_request/url_fetcher_impl.h index bc271b2..e534904 100644 --- a/net/url_request/url_fetcher_impl.h +++ b/net/url_request/url_fetcher_impl.h @@ -38,60 +38,60 @@ class NET_EXPORT_PRIVATE URLFetcherImpl : public URLFetcher { // URLFetcher implementation: virtual void SetUploadData(const std::string& upload_content_type, - const std::string& upload_content) OVERRIDE; + const std::string& upload_content) override; virtual void SetUploadFilePath( const std::string& upload_content_type, const base::FilePath& file_path, uint64 range_offset, uint64 range_length, - scoped_refptr<base::TaskRunner> file_task_runner) OVERRIDE; + scoped_refptr<base::TaskRunner> file_task_runner) override; virtual void SetChunkedUpload( - const std::string& upload_content_type) OVERRIDE; + const std::string& upload_content_type) override; virtual void AppendChunkToUpload(const std::string& data, - bool is_last_chunk) OVERRIDE; - virtual void SetLoadFlags(int load_flags) OVERRIDE; - virtual int GetLoadFlags() const OVERRIDE; - virtual void SetReferrer(const std::string& referrer) OVERRIDE; + bool is_last_chunk) override; + virtual void SetLoadFlags(int load_flags) override; + virtual int GetLoadFlags() const override; + virtual void SetReferrer(const std::string& referrer) override; virtual void SetReferrerPolicy( - URLRequest::ReferrerPolicy referrer_policy) OVERRIDE; + URLRequest::ReferrerPolicy referrer_policy) override; virtual void SetExtraRequestHeaders( - const std::string& extra_request_headers) OVERRIDE; - virtual void AddExtraRequestHeader(const std::string& header_line) OVERRIDE; + const std::string& extra_request_headers) override; + virtual void AddExtraRequestHeader(const std::string& header_line) override; virtual void SetRequestContext( - URLRequestContextGetter* request_context_getter) OVERRIDE; + URLRequestContextGetter* request_context_getter) override; virtual void SetFirstPartyForCookies( - const GURL& first_party_for_cookies) OVERRIDE; + const GURL& first_party_for_cookies) override; virtual void SetURLRequestUserData( const void* key, - const CreateDataCallback& create_data_callback) OVERRIDE; - virtual void SetStopOnRedirect(bool stop_on_redirect) OVERRIDE; - virtual void SetAutomaticallyRetryOn5xx(bool retry) OVERRIDE; - virtual void SetMaxRetriesOn5xx(int max_retries) OVERRIDE; - virtual int GetMaxRetriesOn5xx() const OVERRIDE; - virtual base::TimeDelta GetBackoffDelay() const OVERRIDE; - virtual void SetAutomaticallyRetryOnNetworkChanges(int max_retries) OVERRIDE; + const CreateDataCallback& create_data_callback) override; + virtual void SetStopOnRedirect(bool stop_on_redirect) override; + virtual void SetAutomaticallyRetryOn5xx(bool retry) override; + virtual void SetMaxRetriesOn5xx(int max_retries) override; + virtual int GetMaxRetriesOn5xx() const override; + virtual base::TimeDelta GetBackoffDelay() const override; + virtual void SetAutomaticallyRetryOnNetworkChanges(int max_retries) override; virtual void SaveResponseToFileAtPath( const base::FilePath& file_path, - scoped_refptr<base::SequencedTaskRunner> file_task_runner) OVERRIDE; + scoped_refptr<base::SequencedTaskRunner> file_task_runner) override; virtual void SaveResponseToTemporaryFile( - scoped_refptr<base::SequencedTaskRunner> file_task_runner) OVERRIDE; + scoped_refptr<base::SequencedTaskRunner> file_task_runner) override; virtual void SaveResponseWithWriter( - scoped_ptr<URLFetcherResponseWriter> response_writer) OVERRIDE; - virtual HttpResponseHeaders* GetResponseHeaders() const OVERRIDE; - virtual HostPortPair GetSocketAddress() const OVERRIDE; - virtual bool WasFetchedViaProxy() const OVERRIDE; - virtual void Start() OVERRIDE; - virtual const GURL& GetOriginalURL() const OVERRIDE; - virtual const GURL& GetURL() const OVERRIDE; - virtual const URLRequestStatus& GetStatus() const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; - virtual const ResponseCookies& GetCookies() const OVERRIDE; - virtual void ReceivedContentWasMalformed() OVERRIDE; + scoped_ptr<URLFetcherResponseWriter> response_writer) override; + virtual HttpResponseHeaders* GetResponseHeaders() const override; + virtual HostPortPair GetSocketAddress() const override; + virtual bool WasFetchedViaProxy() const override; + virtual void Start() override; + virtual const GURL& GetOriginalURL() const override; + virtual const GURL& GetURL() const override; + virtual const URLRequestStatus& GetStatus() const override; + virtual int GetResponseCode() const override; + virtual const ResponseCookies& GetCookies() const override; + virtual void ReceivedContentWasMalformed() override; virtual bool GetResponseAsString( - std::string* out_response_string) const OVERRIDE; + std::string* out_response_string) const override; virtual bool GetResponseAsFilePath( bool take_ownership, - base::FilePath* out_response_path) const OVERRIDE; + base::FilePath* out_response_path) const override; static void CancelAll(); diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc index 2f1acce..5c97366 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_; diff --git a/net/url_request/url_fetcher_response_writer.h b/net/url_request/url_fetcher_response_writer.h index 428f441..3321f5c 100644 --- a/net/url_request/url_fetcher_response_writer.h +++ b/net/url_request/url_fetcher_response_writer.h @@ -65,12 +65,12 @@ class NET_EXPORT URLFetcherStringWriter : public URLFetcherResponseWriter { const std::string& data() const { return data_; } // URLFetcherResponseWriter overrides: - virtual int Initialize(const CompletionCallback& callback) OVERRIDE; + virtual int Initialize(const CompletionCallback& callback) override; virtual int Write(IOBuffer* buffer, int num_bytes, - const CompletionCallback& callback) OVERRIDE; - virtual int Finish(const CompletionCallback& callback) OVERRIDE; - virtual URLFetcherStringWriter* AsStringWriter() OVERRIDE; + const CompletionCallback& callback) override; + virtual int Finish(const CompletionCallback& callback) override; + virtual URLFetcherStringWriter* AsStringWriter() override; private: std::string data_; @@ -91,12 +91,12 @@ class NET_EXPORT URLFetcherFileWriter : public URLFetcherResponseWriter { const base::FilePath& file_path() const { return file_path_; } // URLFetcherResponseWriter overrides: - virtual int Initialize(const CompletionCallback& callback) OVERRIDE; + virtual int Initialize(const CompletionCallback& callback) override; virtual int Write(IOBuffer* buffer, int num_bytes, - const CompletionCallback& callback) OVERRIDE; - virtual int Finish(const CompletionCallback& callback) OVERRIDE; - virtual URLFetcherFileWriter* AsFileWriter() OVERRIDE; + const CompletionCallback& callback) override; + virtual int Finish(const CompletionCallback& callback) override; + virtual URLFetcherFileWriter* AsFileWriter() override; // Drops ownership of the file at |file_path_|. // This class will not delete it or write to it again. diff --git a/net/url_request/url_fetcher_response_writer_unittest.cc b/net/url_request/url_fetcher_response_writer_unittest.cc index a2e00c8..71cb671 100644 --- a/net/url_request/url_fetcher_response_writer_unittest.cc +++ b/net/url_request/url_fetcher_response_writer_unittest.cc @@ -23,7 +23,7 @@ const char kData[] = "Hello!"; class URLFetcherStringWriterTest : public PlatformTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { writer_.reset(new URLFetcherStringWriter); buf_ = new StringIOBuffer(kData); } @@ -54,7 +54,7 @@ TEST_F(URLFetcherStringWriterTest, Basic) { class URLFetcherFileWriterTest : public PlatformTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); file_path_ = temp_dir_.path().AppendASCII("test.txt"); writer_.reset(new URLFetcherFileWriter( @@ -144,7 +144,7 @@ TEST_F(URLFetcherFileWriterTest, DisownFile) { class URLFetcherFileWriterTemporaryFileTest : public PlatformTest { protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { writer_.reset(new URLFetcherFileWriter( base::MessageLoopProxy::current(), base::FilePath())); buf_ = new StringIOBuffer(kData); diff --git a/net/url_request/url_range_request_job.h b/net/url_request/url_range_request_job.h index 85f394c..190389d 100644 --- a/net/url_request/url_range_request_job.h +++ b/net/url_request/url_range_request_job.h @@ -25,7 +25,7 @@ class NET_EXPORT URLRangeRequestJob : public URLRequestJob { NetworkDelegate* delegate); virtual void SetExtraRequestHeaders( - const HttpRequestHeaders& headers) OVERRIDE; + const HttpRequestHeaders& headers) override; const std::vector<HttpByteRange>& ranges() const { return ranges_; } int range_parse_result() const { return range_parse_result_; } diff --git a/net/url_request/url_request_about_job.h b/net/url_request/url_request_about_job.h index 66a888a..d4b4867 100644 --- a/net/url_request/url_request_about_job.h +++ b/net/url_request/url_request_about_job.h @@ -18,8 +18,8 @@ class NET_EXPORT URLRequestAboutJob : public URLRequestJob { URLRequestAboutJob(URLRequest* request, NetworkDelegate* network_delegate); // URLRequestJob: - virtual void Start() OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; + virtual void Start() override; + virtual bool GetMimeType(std::string* mime_type) const override; private: virtual ~URLRequestAboutJob(); diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index a7f5a0b..2e2fcc4 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -56,68 +56,68 @@ class BasicNetworkDelegate : public NetworkDelegate { private: virtual int OnBeforeURLRequest(URLRequest* request, const CompletionCallback& callback, - GURL* new_url) OVERRIDE { + GURL* new_url) override { return OK; } virtual int OnBeforeSendHeaders(URLRequest* request, const CompletionCallback& callback, - HttpRequestHeaders* headers) OVERRIDE { + HttpRequestHeaders* headers) override { return OK; } virtual void OnSendHeaders(URLRequest* request, - const HttpRequestHeaders& headers) OVERRIDE {} + const HttpRequestHeaders& headers) override {} virtual int OnHeadersReceived( URLRequest* request, const CompletionCallback& callback, const HttpResponseHeaders* original_response_headers, scoped_refptr<HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE { + GURL* allowed_unsafe_redirect_url) override { return OK; } virtual void OnBeforeRedirect(URLRequest* request, - const GURL& new_location) OVERRIDE {} + const GURL& new_location) override {} - virtual void OnResponseStarted(URLRequest* request) OVERRIDE {} + virtual void OnResponseStarted(URLRequest* request) override {} virtual void OnRawBytesRead(const URLRequest& request, - int bytes_read) OVERRIDE {} + int bytes_read) override {} - virtual void OnCompleted(URLRequest* request, bool started) OVERRIDE {} + virtual void OnCompleted(URLRequest* request, bool started) override {} - virtual void OnURLRequestDestroyed(URLRequest* request) OVERRIDE {} + virtual void OnURLRequestDestroyed(URLRequest* request) override {} virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE {} + const base::string16& error) override {} virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired( URLRequest* request, const AuthChallengeInfo& auth_info, const AuthCallback& callback, - AuthCredentials* credentials) OVERRIDE { + AuthCredentials* credentials) override { return NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; } virtual bool OnCanGetCookies(const URLRequest& request, - const CookieList& cookie_list) OVERRIDE { + const CookieList& cookie_list) override { return true; } virtual bool OnCanSetCookie(const URLRequest& request, const std::string& cookie_line, - CookieOptions* options) OVERRIDE { + CookieOptions* options) override { return true; } virtual bool OnCanAccessFile(const net::URLRequest& request, - const base::FilePath& path) const OVERRIDE { + const base::FilePath& path) const override { return true; } - virtual bool OnCanThrottleRequest(const URLRequest& request) const OVERRIDE { + virtual bool OnCanThrottleRequest(const URLRequest& request) const override { // Returning true will only enable throttling if there's also a // URLRequestThrottlerManager, which there isn't, by default. return true; @@ -125,7 +125,7 @@ class BasicNetworkDelegate : public NetworkDelegate { virtual int OnBeforeSocketStreamConnect( SocketStream* stream, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return OK; } diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc index b5a3da2..f0f4b82 100644 --- a/net/url_request/url_request_context_builder_unittest.cc +++ b/net/url_request/url_request_context_builder_unittest.cc @@ -51,7 +51,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory { CreateReason reason, int nonce_count, const BoundNetLog& net_log, - scoped_ptr<HttpAuthHandler>* handler) OVERRIDE { + scoped_ptr<HttpAuthHandler>* handler) override { handler->reset(); return return_code_; } diff --git a/net/url_request/url_request_context_getter.h b/net/url_request/url_request_context_getter.h index 1f56f70..aa2d64b 100644 --- a/net/url_request/url_request_context_getter.h +++ b/net/url_request/url_request_context_getter.h @@ -62,10 +62,10 @@ public: const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner); // net::URLRequestContextGetter implementation: - virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE; + virtual net::URLRequestContext* GetURLRequestContext() override; virtual scoped_refptr<base::SingleThreadTaskRunner> - GetNetworkTaskRunner() const OVERRIDE; + GetNetworkTaskRunner() const override; private: virtual ~TrivialURLRequestContextGetter(); diff --git a/net/url_request/url_request_data_job.h b/net/url_request/url_request_data_job.h index f2e38aa..c39ae8d8 100644 --- a/net/url_request/url_request_data_job.h +++ b/net/url_request/url_request_data_job.h @@ -33,7 +33,7 @@ class NET_EXPORT URLRequestDataJob : public URLRequestSimpleJob { virtual int GetData(std::string* mime_type, std::string* charset, std::string* data, - const CompletionCallback& callback) const OVERRIDE; + const CompletionCallback& callback) const override; private: virtual ~URLRequestDataJob(); diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h index 7c162f0..0bb37ec 100644 --- a/net/url_request/url_request_error_job.h +++ b/net/url_request/url_request_error_job.h @@ -20,7 +20,7 @@ class NET_EXPORT URLRequestErrorJob : public URLRequestJob { NetworkDelegate* network_delegate, int error); - virtual void Start() OVERRIDE; + virtual void Start() override; private: virtual ~URLRequestErrorJob(); diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h index f897493..b353697 100644 --- a/net/url_request/url_request_file_dir_job.h +++ b/net/url_request/url_request_file_dir_job.h @@ -27,18 +27,18 @@ class URLRequestFileDirJob virtual void StartAsync(); // Overridden from URLRequestJob: - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; + virtual void Start() override; + virtual void Kill() override; virtual bool ReadRawData(IOBuffer* buf, int buf_size, - int* bytes_read) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; + int* bytes_read) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual bool GetCharset(std::string* charset) override; // Overridden from DirectoryLister::DirectoryListerDelegate: virtual void OnListFile( - const DirectoryLister::DirectoryListerData& data) OVERRIDE; - virtual void OnListDone(int error) OVERRIDE; + const DirectoryLister::DirectoryListerData& data) override; + virtual void OnListDone(int error) override; private: virtual ~URLRequestFileDirJob(); diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h index 15c1e4d..3a5aae7 100644 --- a/net/url_request/url_request_file_job.h +++ b/net/url_request/url_request_file_job.h @@ -36,17 +36,17 @@ class NET_EXPORT URLRequestFileJob : public URLRequestJob { const scoped_refptr<base::TaskRunner>& file_task_runner); // URLRequestJob: - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; + virtual void Start() override; + virtual void Kill() override; virtual bool ReadRawData(IOBuffer* buf, int buf_size, - int* bytes_read) OVERRIDE; + int* bytes_read) override; virtual bool IsRedirectResponse(GURL* location, - int* http_status_code) OVERRIDE; - virtual Filter* SetupFilter() const OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; + int* http_status_code) override; + virtual Filter* SetupFilter() const override; + virtual bool GetMimeType(std::string* mime_type) const override; virtual void SetExtraRequestHeaders( - const HttpRequestHeaders& headers) OVERRIDE; + const HttpRequestHeaders& headers) override; // An interface for subclasses who wish to monitor read operations. virtual void OnSeekComplete(int64 result); diff --git a/net/url_request/url_request_file_job_unittest.cc b/net/url_request/url_request_file_job_unittest.cc index 4f7984c..ba87766 100644 --- a/net/url_request/url_request_file_job_unittest.cc +++ b/net/url_request/url_request_file_job_unittest.cc @@ -41,12 +41,12 @@ class URLRequestFileJobWithCallbacks : public URLRequestFileJob { protected: virtual ~URLRequestFileJobWithCallbacks() {} - virtual void OnSeekComplete(int64 result) OVERRIDE { + virtual void OnSeekComplete(int64 result) override { ASSERT_EQ(seek_position_, 0); seek_position_ = result; } - virtual void OnReadComplete(IOBuffer* buf, int result) OVERRIDE { + virtual void OnReadComplete(IOBuffer* buf, int result) override { data_chunks_.push_back(std::string(buf->data(), result)); } @@ -72,7 +72,7 @@ class CallbacksJobFactory : public URLRequestJobFactory { virtual URLRequestJob* MaybeCreateJobWithProtocolHandler( const std::string& scheme, URLRequest* request, - NetworkDelegate* network_delegate) const OVERRIDE { + NetworkDelegate* network_delegate) const override { URLRequestFileJobWithCallbacks* job = new URLRequestFileJobWithCallbacks( request, network_delegate, @@ -82,15 +82,15 @@ class CallbacksJobFactory : public URLRequestJobFactory { return job; } - virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE { + virtual bool IsHandledProtocol(const std::string& scheme) const override { return scheme == "file"; } - virtual bool IsHandledURL(const GURL& url) const OVERRIDE { + virtual bool IsHandledURL(const GURL& url) const override { return IsHandledProtocol(url.scheme()); } - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE { + virtual bool IsSafeRedirectTarget(const GURL& location) const override { return false; } @@ -116,7 +116,7 @@ bool CreateTempFileWithContent(const std::string& content, class JobObserverImpl : public CallbacksJobFactory::JobObserver { public: - virtual void OnJobCreated(URLRequestFileJobWithCallbacks* job) OVERRIDE { + virtual void OnJobCreated(URLRequestFileJobWithCallbacks* job) override { jobs_.push_back(job); } diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc index 842a54f..04d61cc 100644 --- a/net/url_request/url_request_filter.cc +++ b/net/url_request/url_request_filter.cc @@ -22,7 +22,7 @@ class URLRequestFilterInterceptor : public URLRequestInterceptor { // URLRequestInterceptor implementation. virtual URLRequestJob* MaybeInterceptRequest( - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE { + URLRequest* request, NetworkDelegate* network_delegate) const override { return factory_(request, network_delegate, request->url().scheme()); } diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h index 93baedb..3388d92 100644 --- a/net/url_request/url_request_filter.h +++ b/net/url_request/url_request_filter.h @@ -69,7 +69,7 @@ class NET_EXPORT URLRequestFilter : public URLRequestInterceptor { // URLRequestInterceptor implementation: virtual URLRequestJob* MaybeInterceptRequest( URLRequest* request, - NetworkDelegate* network_delegate) const OVERRIDE; + NetworkDelegate* network_delegate) const override; private: // scheme,hostname -> URLRequestInterceptor diff --git a/net/url_request/url_request_filter_unittest.cc b/net/url_request/url_request_filter_unittest.cc index 0e1f2df..bd2a782 100644 --- a/net/url_request/url_request_filter_unittest.cc +++ b/net/url_request/url_request_filter_unittest.cc @@ -43,7 +43,7 @@ class TestURLRequestInterceptor : public URLRequestInterceptor { virtual ~TestURLRequestInterceptor() {} virtual URLRequestJob* MaybeInterceptRequest( - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE { + URLRequest* request, NetworkDelegate* network_delegate) const override { job_c = new URLRequestTestJob(request, network_delegate); return job_c; } diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h index 6c40b65..61d4cff 100644 --- a/net/url_request/url_request_ftp_job.h +++ b/net/url_request/url_request_ftp_job.h @@ -37,13 +37,13 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob { virtual ~URLRequestFtpJob(); // Overridden from URLRequestJob: - virtual bool IsSafeRedirect(const GURL& location) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE; - virtual HostPortPair GetSocketAddress() const OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; + virtual bool IsSafeRedirect(const GURL& location) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual void GetResponseInfo(HttpResponseInfo* info) override; + virtual HostPortPair GetSocketAddress() const override; + virtual void SetPriority(RequestPriority priority) override; + virtual void Start() override; + virtual void Kill() override; RequestPriority priority() const { return priority_; } @@ -62,18 +62,18 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob { void LogFtpServerType(char server_type); // Overridden from URLRequestJob: - virtual LoadState GetLoadState() const OVERRIDE; - virtual bool NeedsAuth() OVERRIDE; + virtual LoadState GetLoadState() const override; + virtual bool NeedsAuth() override; virtual void GetAuthChallengeInfo( - scoped_refptr<AuthChallengeInfo>* auth_info) OVERRIDE; - virtual void SetAuth(const AuthCredentials& credentials) OVERRIDE; - virtual void CancelAuth() OVERRIDE; + scoped_refptr<AuthChallengeInfo>* auth_info) override; + virtual void SetAuth(const AuthCredentials& credentials) override; + virtual void CancelAuth() override; // TODO(ibrar): Yet to give another look at this function. - virtual UploadProgress GetUploadProgress() const OVERRIDE; + virtual UploadProgress GetUploadProgress() const override; virtual bool ReadRawData(IOBuffer* buf, int buf_size, - int *bytes_read) OVERRIDE; + int *bytes_read) override; void HandleAuthNeededResponse(); diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc index 3ecb97e..629613d 100644 --- a/net/url_request/url_request_ftp_job_unittest.cc +++ b/net/url_request/url_request_ftp_job_unittest.cc @@ -67,18 +67,18 @@ class SimpleProxyConfigService : public ProxyConfigService { config_.proxy_rules().ParseFromString("ftp=localhost"); } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observer_ = observer; } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { if (observer_ == observer) { observer_ = NULL; } } virtual ConfigAvailability GetLatestProxyConfig( - ProxyConfig* config) OVERRIDE { + ProxyConfig* config) override { *config = config_; return CONFIG_VALID; } @@ -113,11 +113,11 @@ class TestURLRequestFtpJob : public URLRequestFtpJob { class MockFtpTransactionFactory : public FtpTransactionFactory { public: - virtual FtpTransaction* CreateTransaction() OVERRIDE { + virtual FtpTransaction* CreateTransaction() override { return NULL; } - virtual void Suspend(bool suspend) OVERRIDE {} + virtual void Suspend(bool suspend) override {} }; // Fixture for priority-related tests. Priority matters when there is diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 2ebdd15..fc26e94 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -58,17 +58,17 @@ class URLRequestHttpJob::HttpFilterContext : public FilterContext { virtual ~HttpFilterContext(); // FilterContext implementation. - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual bool GetURL(GURL* gurl) const OVERRIDE; - virtual bool GetContentDisposition(std::string* disposition) const OVERRIDE; - virtual base::Time GetRequestTime() const OVERRIDE; - virtual bool IsCachedContent() const OVERRIDE; - virtual bool IsDownload() const OVERRIDE; - virtual bool SdchResponseExpected() const OVERRIDE; - virtual int64 GetByteReadCount() const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; - virtual const URLRequestContext* GetURLRequestContext() const OVERRIDE; - virtual void RecordPacketStats(StatisticSelector statistic) const OVERRIDE; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual bool GetURL(GURL* gurl) const override; + virtual bool GetContentDisposition(std::string* disposition) const override; + virtual base::Time GetRequestTime() const override; + virtual bool IsCachedContent() const override; + virtual bool IsDownload() const override; + virtual bool SdchResponseExpected() const override; + virtual int64 GetByteReadCount() const override; + virtual int GetResponseCode() const override; + virtual const URLRequestContext* GetURLRequestContext() const override; + virtual void RecordPacketStats(StatisticSelector statistic) const override; // Method to allow us to reset filter context for a response that should have // been SDCH encoded when there is an update due to an explicit HTTP header. diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h index 6f8dccc..4b0cc67 100644 --- a/net/url_request/url_request_http_job.h +++ b/net/url_request/url_request_http_job.h @@ -48,9 +48,9 @@ class NET_EXPORT_PRIVATE URLRequestHttpJob : public URLRequestJob { virtual ~URLRequestHttpJob(); // Overridden from URLRequestJob: - virtual void SetPriority(RequestPriority priority) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Kill() OVERRIDE; + virtual void SetPriority(RequestPriority priority) override; + virtual void Start() override; + virtual void Kill() override; RequestPriority priority() const { return priority_; @@ -99,44 +99,44 @@ class NET_EXPORT_PRIVATE URLRequestHttpJob : public URLRequestJob { void RestartTransactionWithAuth(const AuthCredentials& credentials); // Overridden from URLRequestJob: - virtual void SetUpload(UploadDataStream* upload) OVERRIDE; + virtual void SetUpload(UploadDataStream* upload) override; virtual void SetExtraRequestHeaders( - const HttpRequestHeaders& headers) OVERRIDE; - virtual LoadState GetLoadState() const OVERRIDE; - virtual UploadProgress GetUploadProgress() const OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; - virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE; + const HttpRequestHeaders& headers) override; + virtual LoadState GetLoadState() const override; + virtual UploadProgress GetUploadProgress() const override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual bool GetCharset(std::string* charset) override; + virtual void GetResponseInfo(HttpResponseInfo* info) override; virtual void GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual bool GetResponseCookies(std::vector<std::string>* cookies) OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; - virtual Filter* SetupFilter() const OVERRIDE; - virtual bool CopyFragmentOnRedirect(const GURL& location) const OVERRIDE; - virtual bool IsSafeRedirect(const GURL& location) OVERRIDE; - virtual bool NeedsAuth() OVERRIDE; - virtual void GetAuthChallengeInfo(scoped_refptr<AuthChallengeInfo>*) OVERRIDE; - virtual void SetAuth(const AuthCredentials& credentials) OVERRIDE; - virtual void CancelAuth() OVERRIDE; - virtual void ContinueWithCertificate(X509Certificate* client_cert) OVERRIDE; - virtual void ContinueDespiteLastError() OVERRIDE; - virtual void ResumeNetworkStart() OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual bool GetResponseCookies(std::vector<std::string>* cookies) override; + virtual int GetResponseCode() const override; + virtual Filter* SetupFilter() const override; + virtual bool CopyFragmentOnRedirect(const GURL& location) const override; + virtual bool IsSafeRedirect(const GURL& location) override; + virtual bool NeedsAuth() override; + virtual void GetAuthChallengeInfo(scoped_refptr<AuthChallengeInfo>*) override; + virtual void SetAuth(const AuthCredentials& credentials) override; + virtual void CancelAuth() override; + virtual void ContinueWithCertificate(X509Certificate* client_cert) override; + virtual void ContinueDespiteLastError() override; + virtual void ResumeNetworkStart() override; virtual bool ReadRawData(IOBuffer* buf, int buf_size, - int* bytes_read) OVERRIDE; - virtual void StopCaching() OVERRIDE; + int* bytes_read) override; + virtual void StopCaching() override; virtual bool GetFullRequestHeaders( - HttpRequestHeaders* headers) const OVERRIDE; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; - virtual void DoneReading() OVERRIDE; - virtual void DoneReadingRedirectResponse() OVERRIDE; + HttpRequestHeaders* headers) const override; + virtual int64 GetTotalReceivedBytes() const override; + virtual void DoneReading() override; + virtual void DoneReadingRedirectResponse() override; - virtual HostPortPair GetSocketAddress() const OVERRIDE; - virtual void NotifyURLRequestDestroyed() OVERRIDE; + virtual HostPortPair GetSocketAddress() const override; + virtual void NotifyURLRequestDestroyed() override; void RecordTimer(); void ResetTimer(); - virtual void UpdatePacketReadTimes() OVERRIDE; + virtual void UpdatePacketReadTimes() override; void RecordPacketStats(FilterContext::StatisticSelector statistic) const; void RecordCompressionHistograms(); diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc index 5cb84d6..c6848d3 100644 --- a/net/url_request/url_request_http_job_unittest.cc +++ b/net/url_request/url_request_http_job_unittest.cc @@ -231,7 +231,7 @@ class MockCreateHelper : public WebSocketHandshakeStreamBase::CreateHelper { // scoped_ptr, so this forwarding method acts as a workaround. virtual WebSocketHandshakeStreamBase* CreateBasicStream( scoped_ptr<ClientSocketHandle> connection, - bool using_proxy) OVERRIDE { + bool using_proxy) override { // Discard the arguments since we don't need them anyway. return CreateBasicStreamMock(); } @@ -256,58 +256,58 @@ class FakeWebSocketHandshakeStream : public WebSocketHandshakeStreamBase { virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { initialize_stream_was_called_ = true; return ERR_IO_PENDING; } virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE { + virtual int ReadResponseHeaders(const CompletionCallback& callback) override { return ERR_IO_PENDING; } virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } - virtual void Close(bool not_reusable) OVERRIDE {} + virtual void Close(bool not_reusable) override {} - virtual bool IsResponseBodyComplete() const OVERRIDE { return false; } + virtual bool IsResponseBodyComplete() const override { return false; } - virtual bool CanFindEndOfResponse() const OVERRIDE { return false; } + virtual bool CanFindEndOfResponse() const override { return false; } - virtual bool IsConnectionReused() const OVERRIDE { return false; } - virtual void SetConnectionReused() OVERRIDE {} + virtual bool IsConnectionReused() const override { return false; } + virtual void SetConnectionReused() override {} - virtual bool IsConnectionReusable() const OVERRIDE { return false; } + virtual bool IsConnectionReusable() const override { return false; } - virtual int64 GetTotalReceivedBytes() const OVERRIDE { return 0; } + virtual int64 GetTotalReceivedBytes() const override { return 0; } virtual bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const - OVERRIDE { + override { return false; } - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE {} + virtual void GetSSLInfo(SSLInfo* ssl_info) override {} virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) - OVERRIDE {} + override {} - virtual bool IsSpdyHttpStream() const OVERRIDE { return false; } + virtual bool IsSpdyHttpStream() const override { return false; } - virtual void Drain(HttpNetworkSession* session) OVERRIDE {} + virtual void Drain(HttpNetworkSession* session) override {} - virtual void SetPriority(RequestPriority priority) OVERRIDE {} + virtual void SetPriority(RequestPriority priority) override {} // Fake implementation of WebSocketHandshakeStreamBase method(s) - virtual scoped_ptr<WebSocketStream> Upgrade() OVERRIDE { + virtual scoped_ptr<WebSocketStream> Upgrade() override { return scoped_ptr<WebSocketStream>(); } diff --git a/net/url_request/url_request_intercepting_job_factory.h b/net/url_request/url_request_intercepting_job_factory.h index b18af54..909a25c 100644 --- a/net/url_request/url_request_intercepting_job_factory.h +++ b/net/url_request/url_request_intercepting_job_factory.h @@ -41,10 +41,10 @@ class NET_EXPORT URLRequestInterceptingJobFactory virtual URLRequestJob* MaybeCreateJobWithProtocolHandler( const std::string& scheme, URLRequest* request, - NetworkDelegate* network_delegate) const OVERRIDE; - virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE; - virtual bool IsHandledURL(const GURL& url) const OVERRIDE; - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; + NetworkDelegate* network_delegate) const override; + virtual bool IsHandledProtocol(const std::string& scheme) const override; + virtual bool IsHandledURL(const GURL& url) const override; + virtual bool IsSafeRedirectTarget(const GURL& location) const override; private: scoped_ptr<URLRequestJobFactory> job_factory_; diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index 2dcd67a..5b8760f 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -219,7 +219,7 @@ class NET_EXPORT URLRequestJob // base::PowerObserver methods: // We invoke URLRequestJob::Kill on suspend (crbug.com/4606). - virtual void OnSuspend() OVERRIDE; + virtual void OnSuspend() override; // Called after a NetworkDelegate has been informed that the URLRequest // will be destroyed. This is used to track that no pending callbacks diff --git a/net/url_request/url_request_job_factory_impl.h b/net/url_request/url_request_job_factory_impl.h index 8de514f..94112c1 100644 --- a/net/url_request/url_request_job_factory_impl.h +++ b/net/url_request/url_request_job_factory_impl.h @@ -32,10 +32,10 @@ class NET_EXPORT URLRequestJobFactoryImpl : public URLRequestJobFactory { virtual URLRequestJob* MaybeCreateJobWithProtocolHandler( const std::string& scheme, URLRequest* request, - NetworkDelegate* network_delegate) const OVERRIDE; - virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE; - virtual bool IsHandledURL(const GURL& url) const OVERRIDE; - virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; + NetworkDelegate* network_delegate) const override; + virtual bool IsHandledProtocol(const std::string& scheme) const override; + virtual bool IsHandledURL(const GURL& url) const override; + virtual bool IsSafeRedirectTarget(const GURL& location) const override; private: // For testing only. diff --git a/net/url_request/url_request_job_factory_impl_unittest.cc b/net/url_request/url_request_job_factory_impl_unittest.cc index 2c36976..61467f1 100644 --- a/net/url_request/url_request_job_factory_impl_unittest.cc +++ b/net/url_request/url_request_job_factory_impl_unittest.cc @@ -26,7 +26,7 @@ class MockURLRequestJob : public URLRequestJob { status_(status), weak_factory_(this) {} - virtual void Start() OVERRIDE { + virtual void Start() override { // Start reading asynchronously so that all error reporting and data // callbacks happen as they would for network requests. base::MessageLoop::current()->PostTask( @@ -50,7 +50,7 @@ class MockURLRequestJob : public URLRequestJob { class DummyProtocolHandler : public URLRequestJobFactory::ProtocolHandler { public: virtual URLRequestJob* MaybeCreateJob( - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE { + URLRequest* request, NetworkDelegate* network_delegate) const override { return new MockURLRequestJob( request, network_delegate, diff --git a/net/url_request/url_request_redirect_job.h b/net/url_request/url_request_redirect_job.h index 23fc811..54bc3f0 100644 --- a/net/url_request/url_request_redirect_job.h +++ b/net/url_request/url_request_redirect_job.h @@ -42,12 +42,12 @@ class NET_EXPORT URLRequestRedirectJob : public URLRequestJob { const std::string& redirect_reason); // URLRequestJob implementation: - virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE; + virtual void GetResponseInfo(HttpResponseInfo* info) override; virtual void GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual void Start() OVERRIDE; - virtual bool CopyFragmentOnRedirect(const GURL& location) const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual void Start() override; + virtual bool CopyFragmentOnRedirect(const GURL& location) const override; + virtual int GetResponseCode() const override; private: virtual ~URLRequestRedirectJob(); diff --git a/net/url_request/url_request_simple_job.h b/net/url_request/url_request_simple_job.h index 633a2e7..01bd319 100644 --- a/net/url_request/url_request_simple_job.h +++ b/net/url_request/url_request_simple_job.h @@ -20,12 +20,12 @@ class NET_EXPORT URLRequestSimpleJob : public URLRangeRequestJob { public: URLRequestSimpleJob(URLRequest* request, NetworkDelegate* network_delegate); - virtual void Start() OVERRIDE; + virtual void Start() override; virtual bool ReadRawData(IOBuffer* buf, int buf_size, - int *bytes_read) OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual bool GetCharset(std::string* charset) OVERRIDE; + int *bytes_read) override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual bool GetCharset(std::string* charset) override; protected: virtual ~URLRequestSimpleJob(); diff --git a/net/url_request/url_request_simple_job_unittest.cc b/net/url_request/url_request_simple_job_unittest.cc index 512833f..b75da80 100644 --- a/net/url_request/url_request_simple_job_unittest.cc +++ b/net/url_request/url_request_simple_job_unittest.cc @@ -35,7 +35,7 @@ class MockSimpleJob : public URLRequestSimpleJob { virtual int GetData(std::string* mime_type, std::string* charset, std::string* data, - const CompletionCallback& callback) const OVERRIDE { + const CompletionCallback& callback) const override { mime_type->assign("text/plain"); charset->assign("US-ASCII"); data->assign(kTestData); @@ -55,7 +55,7 @@ class SimpleJobProtocolHandler : public: virtual URLRequestJob* MaybeCreateJob( URLRequest* request, - NetworkDelegate* network_delegate) const OVERRIDE { + NetworkDelegate* network_delegate) const override { return new MockSimpleJob(request, network_delegate); } }; diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc index 422e080..3806e25 100644 --- a/net/url_request/url_request_test_job.cc +++ b/net/url_request/url_request_test_job.cc @@ -28,7 +28,7 @@ class TestJobProtocolHandler : public URLRequestJobFactory::ProtocolHandler { public: // URLRequestJobFactory::ProtocolHandler implementation: virtual URLRequestJob* MaybeCreateJob( - URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE { + URLRequest* request, NetworkDelegate* network_delegate) const override { return new URLRequestTestJob(request, network_delegate); } }; diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h index 1a85fb0..f0f26fd 100644 --- a/net/url_request/url_request_test_job.h +++ b/net/url_request/url_request_test_job.h @@ -108,19 +108,19 @@ class NET_EXPORT_PRIVATE URLRequestTestJob : public URLRequestJob { static URLRequestJobFactory::ProtocolHandler* CreateProtocolHandler(); // Job functions - virtual void SetPriority(RequestPriority priority) OVERRIDE; - virtual void Start() OVERRIDE; + virtual void SetPriority(RequestPriority priority) override; + virtual void Start() override; virtual bool ReadRawData(IOBuffer* buf, int buf_size, - int *bytes_read) OVERRIDE; - virtual void Kill() OVERRIDE; - virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; - virtual void GetResponseInfo(HttpResponseInfo* info) OVERRIDE; + int *bytes_read) override; + virtual void Kill() override; + virtual bool GetMimeType(std::string* mime_type) const override; + virtual void GetResponseInfo(HttpResponseInfo* info) override; virtual void GetLoadTimingInfo( - LoadTimingInfo* load_timing_info) const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + LoadTimingInfo* load_timing_info) const override; + virtual int GetResponseCode() const override; virtual bool IsRedirectResponse(GURL* location, - int* http_status_code) OVERRIDE; + int* http_status_code) override; protected: // Override to specify whether the next read done from this job will diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index cad472e..d301154 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -108,9 +108,9 @@ class TestURLRequestContextGetter : public URLRequestContextGetter { scoped_ptr<TestURLRequestContext> context); // URLRequestContextGetter implementation. - virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE; + virtual TestURLRequestContext* GetURLRequestContext() override; virtual scoped_refptr<base::SingleThreadTaskRunner> - GetNetworkTaskRunner() const OVERRIDE; + GetNetworkTaskRunner() const override; protected: virtual ~TestURLRequestContextGetter(); @@ -171,19 +171,19 @@ class TestDelegate : public URLRequest::Delegate { // URLRequest::Delegate: virtual void OnReceivedRedirect(URLRequest* request, const RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE; - virtual void OnBeforeNetworkStart(URLRequest* request, bool* defer) OVERRIDE; + bool* defer_redirect) override; + virtual void OnBeforeNetworkStart(URLRequest* request, bool* defer) override; virtual void OnAuthRequired(URLRequest* request, - AuthChallengeInfo* auth_info) OVERRIDE; + AuthChallengeInfo* auth_info) override; // NOTE: |fatal| causes |certificate_errors_are_fatal_| to be set to true. // (Unit tests use this as a post-condition.) But for policy, this method // consults |allow_certificate_errors_|. virtual void OnSSLCertificateError(URLRequest* request, const SSLInfo& ssl_info, - bool fatal) OVERRIDE; - virtual void OnResponseStarted(URLRequest* request) OVERRIDE; + bool fatal) override; + virtual void OnResponseStarted(URLRequest* request) override; virtual void OnReadCompleted(URLRequest* request, - int bytes_read) OVERRIDE; + int bytes_read) override; private: static const int kBufferSize = 4096; @@ -286,52 +286,52 @@ class TestNetworkDelegate : public NetworkDelegate { // NetworkDelegate: virtual int OnBeforeURLRequest(URLRequest* request, const CompletionCallback& callback, - GURL* new_url) OVERRIDE; + GURL* new_url) override; virtual int OnBeforeSendHeaders(URLRequest* request, const CompletionCallback& callback, - HttpRequestHeaders* headers) OVERRIDE; + HttpRequestHeaders* headers) override; virtual void OnBeforeSendProxyHeaders( net::URLRequest* request, const net::ProxyInfo& proxy_info, - net::HttpRequestHeaders* headers) OVERRIDE; + net::HttpRequestHeaders* headers) override; virtual void OnSendHeaders(URLRequest* request, - const HttpRequestHeaders& headers) OVERRIDE; + const HttpRequestHeaders& headers) override; virtual int OnHeadersReceived( URLRequest* request, const CompletionCallback& callback, const HttpResponseHeaders* original_response_headers, scoped_refptr<HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE; + GURL* allowed_unsafe_redirect_url) override; virtual void OnBeforeRedirect(URLRequest* request, - const GURL& new_location) OVERRIDE; - virtual void OnResponseStarted(URLRequest* request) OVERRIDE; + const GURL& new_location) override; + virtual void OnResponseStarted(URLRequest* request) override; virtual void OnRawBytesRead(const URLRequest& request, - int bytes_read) OVERRIDE; - virtual void OnCompleted(URLRequest* request, bool started) OVERRIDE; - virtual void OnURLRequestDestroyed(URLRequest* request) OVERRIDE; + int bytes_read) override; + virtual void OnCompleted(URLRequest* request, bool started) override; + virtual void OnURLRequestDestroyed(URLRequest* request) override; virtual void OnPACScriptError(int line_number, - const base::string16& error) OVERRIDE; + const base::string16& error) override; virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired( URLRequest* request, const AuthChallengeInfo& auth_info, const AuthCallback& callback, - AuthCredentials* credentials) OVERRIDE; + AuthCredentials* credentials) override; virtual bool OnCanGetCookies(const URLRequest& request, - const CookieList& cookie_list) OVERRIDE; + const CookieList& cookie_list) override; virtual bool OnCanSetCookie(const URLRequest& request, const std::string& cookie_line, - CookieOptions* options) OVERRIDE; + CookieOptions* options) override; virtual bool OnCanAccessFile(const URLRequest& request, - const base::FilePath& path) const OVERRIDE; + const base::FilePath& path) const override; virtual bool OnCanThrottleRequest( - const URLRequest& request) const OVERRIDE; + const URLRequest& request) const override; virtual int OnBeforeSocketStreamConnect( SocketStream* stream, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual bool OnCancelURLRequestWithPolicyViolatingReferrerHeader( const URLRequest& request, const GURL& target_url, - const GURL& referrer_url) const OVERRIDE; + const GURL& referrer_url) const override; void InitRequestStatesIfNew(int request_id); @@ -408,7 +408,7 @@ class TestJobInterceptor : public URLRequestJobFactory::ProtocolHandler { virtual URLRequestJob* MaybeCreateJob( URLRequest* request, - NetworkDelegate* network_delegate) const OVERRIDE; + NetworkDelegate* network_delegate) const override; void set_main_intercept_job(URLRequestJob* job); private: diff --git a/net/url_request/url_request_throttler_entry.h b/net/url_request/url_request_throttler_entry.h index a7a0524..489eecb 100644 --- a/net/url_request/url_request_throttler_entry.h +++ b/net/url_request/url_request_throttler_entry.h @@ -95,14 +95,14 @@ class NET_EXPORT URLRequestThrottlerEntry // Implementation of URLRequestThrottlerEntryInterface. virtual bool ShouldRejectRequest( const URLRequest& request, - NetworkDelegate* network_delegate) const OVERRIDE; + NetworkDelegate* network_delegate) const override; virtual int64 ReserveSendingTimeForNextRequest( - const base::TimeTicks& earliest_time) OVERRIDE; - virtual base::TimeTicks GetExponentialBackoffReleaseTime() const OVERRIDE; + const base::TimeTicks& earliest_time) override; + virtual base::TimeTicks GetExponentialBackoffReleaseTime() const override; virtual void UpdateWithResponse( const std::string& host, - const URLRequestThrottlerHeaderInterface* response) OVERRIDE; - virtual void ReceivedContentWasMalformed(int response_code) OVERRIDE; + const URLRequestThrottlerHeaderInterface* response) override; + virtual void ReceivedContentWasMalformed(int response_code) override; protected: virtual ~URLRequestThrottlerEntry(); diff --git a/net/url_request/url_request_throttler_header_adapter.h b/net/url_request/url_request_throttler_header_adapter.h index 17a13a1..ddf7865 100644 --- a/net/url_request/url_request_throttler_header_adapter.h +++ b/net/url_request/url_request_throttler_header_adapter.h @@ -23,8 +23,8 @@ class URLRequestThrottlerHeaderAdapter virtual ~URLRequestThrottlerHeaderAdapter(); // Implementation of URLRequestThrottlerHeaderInterface - virtual std::string GetNormalizedValue(const std::string& key) const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + virtual std::string GetNormalizedValue(const std::string& key) const override; + virtual int GetResponseCode() const override; private: const scoped_refptr<HttpResponseHeaders> response_header_; diff --git a/net/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h index 31d28ef..10c6561 100644 --- a/net/url_request/url_request_throttler_manager.h +++ b/net/url_request/url_request_throttler_manager.h @@ -78,11 +78,11 @@ class NET_EXPORT URLRequestThrottlerManager NetLog* net_log() const; // IPAddressObserver interface. - virtual void OnIPAddressChanged() OVERRIDE; + virtual void OnIPAddressChanged() override; // ConnectionTypeObserver interface. virtual void OnConnectionTypeChanged( - NetworkChangeNotifier::ConnectionType type) OVERRIDE; + NetworkChangeNotifier::ConnectionType type) override; // Method that allows us to transform a URL into an ID that can be used in our // map. Resulting IDs will be lowercase and consist of the scheme, host, port diff --git a/net/url_request/url_request_throttler_simulation_unittest.cc b/net/url_request/url_request_throttler_simulation_unittest.cc index d806376..2f3abbf 100644 --- a/net/url_request/url_request_throttler_simulation_unittest.cc +++ b/net/url_request/url_request_throttler_simulation_unittest.cc @@ -135,11 +135,11 @@ class Server : public DiscreteTimeSimulation::Actor { end_downtime_ = start_time + duration; } - virtual void AdvanceTime(const TimeTicks& absolute_time) OVERRIDE { + virtual void AdvanceTime(const TimeTicks& absolute_time) override { now_ = absolute_time; } - virtual void PerformAction() OVERRIDE { + virtual void PerformAction() override { // We are inserted at the end of the actor's list, so all Requester // instances have already done their bit. if (num_current_tick_queries_ > max_experienced_queries_per_tick_) @@ -306,15 +306,15 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { : URLRequestThrottlerEntry(manager, std::string()), mock_backoff_entry_(&backoff_policy_) {} - virtual const BackoffEntry* GetBackoffEntry() const OVERRIDE { + virtual const BackoffEntry* GetBackoffEntry() const override { return &mock_backoff_entry_; } - virtual BackoffEntry* GetBackoffEntry() OVERRIDE { + virtual BackoffEntry* GetBackoffEntry() override { return &mock_backoff_entry_; } - virtual TimeTicks ImplGetTimeNow() const OVERRIDE { + virtual TimeTicks ImplGetTimeNow() const override { return fake_now_; } @@ -414,14 +414,14 @@ class Requester : public DiscreteTimeSimulation::Actor { DCHECK(server_); } - virtual void AdvanceTime(const TimeTicks& absolute_time) OVERRIDE { + virtual void AdvanceTime(const TimeTicks& absolute_time) override { if (time_of_last_success_.is_null()) time_of_last_success_ = absolute_time; throttler_entry_->SetFakeNow(absolute_time); } - virtual void PerformAction() OVERRIDE { + virtual void PerformAction() override { TimeDelta effective_delay = time_between_requests_; TimeDelta current_jitter = TimeDelta::FromMilliseconds( request_jitter_.InMilliseconds() * base::RandDouble()); diff --git a/net/url_request/url_request_throttler_test_support.h b/net/url_request/url_request_throttler_test_support.h index fc28068..60a63b2 100644 --- a/net/url_request/url_request_throttler_test_support.h +++ b/net/url_request/url_request_throttler_test_support.h @@ -19,7 +19,7 @@ class MockBackoffEntry : public BackoffEntry { virtual ~MockBackoffEntry(); // BackoffEntry overrides. - virtual base::TimeTicks ImplGetTimeNow() const OVERRIDE; + virtual base::TimeTicks ImplGetTimeNow() const override; void set_fake_now(const base::TimeTicks& now); @@ -45,8 +45,8 @@ class MockURLRequestThrottlerHeaderAdapter virtual ~MockURLRequestThrottlerHeaderAdapter(); // URLRequestThrottlerHeaderInterface overrides. - virtual std::string GetNormalizedValue(const std::string& key) const OVERRIDE; - virtual int GetResponseCode() const OVERRIDE; + virtual std::string GetNormalizedValue(const std::string& key) const override; + virtual int GetResponseCode() const override; private: std::string fake_retry_value_; diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc index a3fb410..4188b77 100644 --- a/net/url_request/url_request_throttler_unittest.cc +++ b/net/url_request/url_request_throttler_unittest.cc @@ -63,11 +63,11 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { backoff_policy_.num_errors_to_ignore = 0; } - virtual const BackoffEntry* GetBackoffEntry() const OVERRIDE { + virtual const BackoffEntry* GetBackoffEntry() const override { return &mock_backoff_entry_; } - virtual BackoffEntry* GetBackoffEntry() OVERRIDE { + virtual BackoffEntry* GetBackoffEntry() override { return &mock_backoff_entry_; } @@ -85,7 +85,7 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { } // Overridden for tests. - virtual TimeTicks ImplGetTimeNow() const OVERRIDE { return fake_time_now_; } + virtual TimeTicks ImplGetTimeNow() const override { return fake_time_now_; } void set_exponential_backoff_release_time( const base::TimeTicks& release_time) { diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index dbf858d..325a65a 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -367,24 +367,24 @@ class BlockingNetworkDelegate : public TestNetworkDelegate { // TestNetworkDelegate implementation. virtual int OnBeforeURLRequest(URLRequest* request, const CompletionCallback& callback, - GURL* new_url) OVERRIDE; + GURL* new_url) override; virtual int OnBeforeSendHeaders(URLRequest* request, const CompletionCallback& callback, - HttpRequestHeaders* headers) OVERRIDE; + HttpRequestHeaders* headers) override; virtual int OnHeadersReceived( URLRequest* request, const CompletionCallback& callback, const HttpResponseHeaders* original_response_headers, scoped_refptr<HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE; + GURL* allowed_unsafe_redirect_url) override; virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired( URLRequest* request, const AuthChallengeInfo& auth_info, const AuthCallback& callback, - AuthCredentials* credentials) OVERRIDE; + AuthCredentials* credentials) override; // Resets the callbacks and |stage_blocked_for_callback_|. void Reset(); @@ -1103,7 +1103,7 @@ class RestartTestJob : public URLRequestTestJob { RestartTestJob(URLRequest* request, NetworkDelegate* network_delegate) : URLRequestTestJob(request, network_delegate, true) {} protected: - virtual void StartAsync() OVERRIDE { + virtual void StartAsync() override { this->NotifyRestartRequired(); } private: @@ -1115,7 +1115,7 @@ class CancelTestJob : public URLRequestTestJob { explicit CancelTestJob(URLRequest* request, NetworkDelegate* network_delegate) : URLRequestTestJob(request, network_delegate, true) {} protected: - virtual void StartAsync() OVERRIDE { + virtual void StartAsync() override { request_->Cancel(); } private: @@ -1129,7 +1129,7 @@ class CancelThenRestartTestJob : public URLRequestTestJob { : URLRequestTestJob(request, network_delegate, true) { } protected: - virtual void StartAsync() OVERRIDE { + virtual void StartAsync() override { request_->Cancel(); this->NotifyRestartRequired(); } @@ -1160,7 +1160,7 @@ class TestInterceptor : URLRequest::Interceptor { virtual URLRequestJob* MaybeIntercept( URLRequest* request, - NetworkDelegate* network_delegate) OVERRIDE { + NetworkDelegate* network_delegate) override { if (restart_main_request_) { restart_main_request_ = false; did_restart_main_ = true; @@ -1198,7 +1198,7 @@ class TestInterceptor : URLRequest::Interceptor { virtual URLRequestJob* MaybeInterceptRedirect( URLRequest* request, NetworkDelegate* network_delegate, - const GURL& location) OVERRIDE { + const GURL& location) override { if (cancel_redirect_request_) { cancel_redirect_request_ = false; did_cancel_redirect_ = true; @@ -1216,7 +1216,7 @@ class TestInterceptor : URLRequest::Interceptor { } virtual URLRequestJob* MaybeInterceptResponse( - URLRequest* request, NetworkDelegate* network_delegate) OVERRIDE { + URLRequest* request, NetworkDelegate* network_delegate) override { if (cancel_final_request_) { cancel_final_request_ = false; did_cancel_final_ = true; @@ -2402,7 +2402,7 @@ class FixedDateNetworkDelegate : public TestNetworkDelegate { const CompletionCallback& callback, const HttpResponseHeaders* original_response_headers, scoped_refptr<HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE; + GURL* allowed_unsafe_redirect_url) override; private: std::string fixed_date_; @@ -3994,14 +3994,14 @@ class AsyncLoggingNetworkDelegate : public TestNetworkDelegate { // NetworkDelegate implementation. virtual int OnBeforeURLRequest(URLRequest* request, const CompletionCallback& callback, - GURL* new_url) OVERRIDE { + GURL* new_url) override { TestNetworkDelegate::OnBeforeURLRequest(request, callback, new_url); return RunCallbackAsynchronously(request, callback); } virtual int OnBeforeSendHeaders(URLRequest* request, const CompletionCallback& callback, - HttpRequestHeaders* headers) OVERRIDE { + HttpRequestHeaders* headers) override { TestNetworkDelegate::OnBeforeSendHeaders(request, callback, headers); return RunCallbackAsynchronously(request, callback); } @@ -4011,7 +4011,7 @@ class AsyncLoggingNetworkDelegate : public TestNetworkDelegate { const CompletionCallback& callback, const HttpResponseHeaders* original_response_headers, scoped_refptr<HttpResponseHeaders>* override_response_headers, - GURL* allowed_unsafe_redirect_url) OVERRIDE { + GURL* allowed_unsafe_redirect_url) override { TestNetworkDelegate::OnHeadersReceived(request, callback, original_response_headers, @@ -4024,7 +4024,7 @@ class AsyncLoggingNetworkDelegate : public TestNetworkDelegate { URLRequest* request, const AuthChallengeInfo& auth_info, const AuthCallback& callback, - AuthCredentials* credentials) OVERRIDE { + AuthCredentials* credentials) override { AsyncDelegateLogger::Run( request, LOAD_STATE_WAITING_FOR_DELEGATE, @@ -4086,7 +4086,7 @@ class AsyncLoggingUrlRequestDelegate : public TestDelegate { // URLRequest::Delegate implementation: void virtual OnReceivedRedirect(URLRequest* request, const RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { *defer_redirect = true; AsyncDelegateLogger::Run( request, @@ -4098,7 +4098,7 @@ class AsyncLoggingUrlRequestDelegate : public TestDelegate { base::Unretained(this), request, redirect_info)); } - virtual void OnResponseStarted(URLRequest* request) OVERRIDE { + virtual void OnResponseStarted(URLRequest* request) override { AsyncDelegateLogger::Run( request, LOAD_STATE_WAITING_FOR_DELEGATE, @@ -4110,7 +4110,7 @@ class AsyncLoggingUrlRequestDelegate : public TestDelegate { } virtual void OnReadCompleted(URLRequest* request, - int bytes_read) OVERRIDE { + int bytes_read) override { AsyncDelegateLogger::Run( request, LOAD_STATE_IDLE, @@ -4578,7 +4578,7 @@ const char kExtraValue[] = "fubar"; class RedirectWithAdditionalHeadersDelegate : public TestDelegate { virtual void OnReceivedRedirect(URLRequest* request, const RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { TestDelegate::OnReceivedRedirect(request, redirect_info, defer_redirect); request->SetExtraRequestHeaderByName(kExtraHeader, kExtraValue, false); } @@ -4615,7 +4615,7 @@ const char kExtraHeaderToRemove[] = "To-Be-Removed"; class RedirectWithHeaderRemovalDelegate : public TestDelegate { virtual void OnReceivedRedirect(URLRequest* request, const RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { TestDelegate::OnReceivedRedirect(request, redirect_info, defer_redirect); request->RemoveRequestHeaderByName(kExtraHeaderToRemove); } @@ -6811,7 +6811,7 @@ class SSLClientAuthTestDelegate : public TestDelegate { } virtual void OnCertificateRequested( URLRequest* request, - SSLCertRequestInfo* cert_request_info) OVERRIDE { + SSLCertRequestInfo* cert_request_info) override { on_certificate_requested_count_++; base::MessageLoop::current()->Quit(); } @@ -7331,7 +7331,7 @@ class TestSSLConfigService : public SSLConfigService { rev_checking_required_local_anchors) {} // SSLConfigService: - virtual void GetSSLConfig(SSLConfig* config) OVERRIDE { + virtual void GetSSLConfig(SSLConfig* config) override { *config = SSLConfig(); config->rev_checking_enabled = online_rev_checking_; config->verify_ev_cert = ev_enabled_; @@ -7377,7 +7377,7 @@ class HTTPSOCSPTest : public HTTPSRequestTest { kOCSPTestCertPolicy)) { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { SetupContext(&context_); context_.Init(); @@ -7558,7 +7558,7 @@ TEST_F(HTTPSOCSPTest, Invalid) { class HTTPSHardFailTest : public HTTPSOCSPTest { protected: - virtual void SetupContext(URLRequestContext* context) OVERRIDE { + virtual void SetupContext(URLRequestContext* context) override { context->set_ssl_config_service( new TestSSLConfigService(false /* check for EV */, false /* online revocation checking */, @@ -7596,7 +7596,7 @@ TEST_F(HTTPSHardFailTest, FailsOnOCSPInvalid) { class HTTPSEVCRLSetTest : public HTTPSOCSPTest { protected: - virtual void SetupContext(URLRequestContext* context) OVERRIDE { + virtual void SetupContext(URLRequestContext* context) override { context->set_ssl_config_service( new TestSSLConfigService(true /* check for EV */, false /* online revocation checking */, @@ -7781,7 +7781,7 @@ TEST_F(HTTPSEVCRLSetTest, ExpiredCRLSetAndRevokedNonEVCert) { class HTTPSCRLSetTest : public HTTPSOCSPTest { protected: - virtual void SetupContext(URLRequestContext* context) OVERRIDE { + virtual void SetupContext(URLRequestContext* context) override { context->set_ssl_config_service( new TestSSLConfigService(false /* check for EV */, false /* online revocation checking */, diff --git a/net/websockets/websocket_basic_handshake_stream.h b/net/websockets/websocket_basic_handshake_stream.h index 51f0c4d..cc8f5bf 100644 --- a/net/websockets/websocket_basic_handshake_stream.h +++ b/net/websockets/websocket_basic_handshake_stream.h @@ -42,35 +42,35 @@ class NET_EXPORT_PRIVATE WebSocketBasicHandshakeStream virtual int InitializeStream(const HttpRequestInfo* request_info, RequestPriority priority, const BoundNetLog& net_log, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int SendRequest(const HttpRequestHeaders& request_headers, HttpResponseInfo* response, - const CompletionCallback& callback) OVERRIDE; - virtual int ReadResponseHeaders(const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; + virtual int ReadResponseHeaders(const CompletionCallback& callback) override; virtual int ReadResponseBody(IOBuffer* buf, int buf_len, - const CompletionCallback& callback) OVERRIDE; - virtual void Close(bool not_reusable) OVERRIDE; - virtual bool IsResponseBodyComplete() const OVERRIDE; - virtual bool CanFindEndOfResponse() const OVERRIDE; - virtual bool IsConnectionReused() const OVERRIDE; - virtual void SetConnectionReused() OVERRIDE; - virtual bool IsConnectionReusable() const OVERRIDE; - virtual int64 GetTotalReceivedBytes() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Close(bool not_reusable) override; + virtual bool IsResponseBodyComplete() const override; + virtual bool CanFindEndOfResponse() const override; + virtual bool IsConnectionReused() const override; + virtual void SetConnectionReused() override; + virtual bool IsConnectionReusable() const override; + virtual int64 GetTotalReceivedBytes() const override; virtual bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const - OVERRIDE; - virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; + override; + virtual void GetSSLInfo(SSLInfo* ssl_info) override; virtual void GetSSLCertRequestInfo( - SSLCertRequestInfo* cert_request_info) OVERRIDE; - virtual bool IsSpdyHttpStream() const OVERRIDE; - virtual void Drain(HttpNetworkSession* session) OVERRIDE; - virtual void SetPriority(RequestPriority priority) OVERRIDE; + SSLCertRequestInfo* cert_request_info) override; + virtual bool IsSpdyHttpStream() const override; + virtual void Drain(HttpNetworkSession* session) override; + virtual void SetPriority(RequestPriority priority) override; // This is called from the top level once correct handshake response headers // have been received. It creates an appropriate subclass of WebSocketStream // depending on what extensions were negotiated. This object is unusable after // Upgrade() has been called and should be disposed of as soon as possible. - virtual scoped_ptr<WebSocketStream> Upgrade() OVERRIDE; + virtual scoped_ptr<WebSocketStream> Upgrade() override; // Set the value used for the next Sec-WebSocket-Key header // deterministically. The key is only used once, and then discarded. diff --git a/net/websockets/websocket_basic_stream.h b/net/websockets/websocket_basic_stream.h index ccfebd8..ed2f195 100644 --- a/net/websockets/websocket_basic_stream.h +++ b/net/websockets/websocket_basic_stream.h @@ -44,16 +44,16 @@ class NET_EXPORT_PRIVATE WebSocketBasicStream : public WebSocketStream { // WebSocketStream implementation. virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; - virtual void Close() OVERRIDE; + virtual void Close() override; - virtual std::string GetSubProtocol() const OVERRIDE; + virtual std::string GetSubProtocol() const override; - virtual std::string GetExtensions() const OVERRIDE; + virtual std::string GetExtensions() const override; //////////////////////////////////////////////////////////////////////////// // Methods for testing only. diff --git a/net/websockets/websocket_basic_stream_test.cc b/net/websockets/websocket_basic_stream_test.cc index c67583d..a658fcf 100644 --- a/net/websockets/websocket_basic_stream_test.cc +++ b/net/websockets/websocket_basic_stream_test.cc @@ -237,7 +237,7 @@ class WebSocketBasicStreamSocketWriteTest protected: // All write tests use the same frame, so it is easiest to create it during // test creation. - virtual void SetUp() OVERRIDE { PrepareWriteFrame(); } + virtual void SetUp() override { PrepareWriteFrame(); } // Creates a WebSocketFrame with a wire format matching kWriteFrame and adds // it to |frames_|. diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc index 8c264f1..70fa771 100644 --- a/net/websockets/websocket_channel.cc +++ b/net/websockets/websocket_channel.cc @@ -156,23 +156,23 @@ class WebSocketChannel::ConnectDelegate public: explicit ConnectDelegate(WebSocketChannel* creator) : creator_(creator) {} - virtual void OnSuccess(scoped_ptr<WebSocketStream> stream) OVERRIDE { + virtual void OnSuccess(scoped_ptr<WebSocketStream> stream) override { creator_->OnConnectSuccess(stream.Pass()); // |this| may have been deleted. } - virtual void OnFailure(const std::string& message) OVERRIDE { + virtual void OnFailure(const std::string& message) override { creator_->OnConnectFailure(message); // |this| has been deleted. } virtual void OnStartOpeningHandshake( - scoped_ptr<WebSocketHandshakeRequestInfo> request) OVERRIDE { + scoped_ptr<WebSocketHandshakeRequestInfo> request) override { creator_->OnStartOpeningHandshake(request.Pass()); } virtual void OnFinishOpeningHandshake( - scoped_ptr<WebSocketHandshakeResponseInfo> response) OVERRIDE { + scoped_ptr<WebSocketHandshakeResponseInfo> response) override { creator_->OnFinishOpeningHandshake(response.Pass()); } @@ -180,7 +180,7 @@ class WebSocketChannel::ConnectDelegate scoped_ptr<WebSocketEventInterface::SSLErrorCallbacks> ssl_error_callbacks, const SSLInfo& ssl_info, - bool fatal) OVERRIDE { + bool fatal) override { creator_->OnSSLCertificateError( ssl_error_callbacks.Pass(), ssl_info, fatal); } diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc index 42c1ed6..6535741 100644 --- a/net/websockets/websocket_channel_test.cc +++ b/net/websockets/websocket_channel_test.cc @@ -163,12 +163,12 @@ class MockWebSocketEventInterface : public WebSocketEventInterface { // We can't use GMock with scoped_ptr. ChannelState OnStartOpeningHandshake( - scoped_ptr<WebSocketHandshakeRequestInfo>) OVERRIDE { + scoped_ptr<WebSocketHandshakeRequestInfo>) override { OnStartOpeningHandshakeCalled(); return CHANNEL_ALIVE; } ChannelState OnFinishOpeningHandshake( - scoped_ptr<WebSocketHandshakeResponseInfo>) OVERRIDE { + scoped_ptr<WebSocketHandshakeResponseInfo>) override { OnFinishOpeningHandshakeCalled(); return CHANNEL_ALIVE; } @@ -176,7 +176,7 @@ class MockWebSocketEventInterface : public WebSocketEventInterface { scoped_ptr<SSLErrorCallbacks> ssl_error_callbacks, const GURL& url, const SSLInfo& ssl_info, - bool fatal) OVERRIDE { + bool fatal) override { OnSSLCertificateErrorCalled( ssl_error_callbacks.get(), url, ssl_info, fatal); return CHANNEL_ALIVE; @@ -195,39 +195,39 @@ class FakeWebSocketEventInterface : public WebSocketEventInterface { virtual ChannelState OnAddChannelResponse( bool fail, const std::string& selected_protocol, - const std::string& extensions) OVERRIDE { + const std::string& extensions) override { return fail ? CHANNEL_DELETED : CHANNEL_ALIVE; } virtual ChannelState OnDataFrame(bool fin, WebSocketMessageType type, - const std::vector<char>& data) OVERRIDE { + const std::vector<char>& data) override { return CHANNEL_ALIVE; } - virtual ChannelState OnFlowControl(int64 quota) OVERRIDE { + virtual ChannelState OnFlowControl(int64 quota) override { return CHANNEL_ALIVE; } - virtual ChannelState OnClosingHandshake() OVERRIDE { return CHANNEL_ALIVE; } - virtual ChannelState OnFailChannel(const std::string& message) OVERRIDE { + virtual ChannelState OnClosingHandshake() override { return CHANNEL_ALIVE; } + virtual ChannelState OnFailChannel(const std::string& message) override { return CHANNEL_DELETED; } virtual ChannelState OnDropChannel(bool was_clean, uint16 code, - const std::string& reason) OVERRIDE { + const std::string& reason) override { return CHANNEL_DELETED; } virtual ChannelState OnStartOpeningHandshake( - scoped_ptr<WebSocketHandshakeRequestInfo> request) OVERRIDE { + scoped_ptr<WebSocketHandshakeRequestInfo> request) override { return CHANNEL_ALIVE; } virtual ChannelState OnFinishOpeningHandshake( - scoped_ptr<WebSocketHandshakeResponseInfo> response) OVERRIDE { + scoped_ptr<WebSocketHandshakeResponseInfo> response) override { return CHANNEL_ALIVE; } virtual ChannelState OnSSLCertificateError( scoped_ptr<SSLErrorCallbacks> ssl_error_callbacks, const GURL& url, const SSLInfo& ssl_info, - bool fatal) OVERRIDE { + bool fatal) override { return CHANNEL_ALIVE; } }; @@ -246,22 +246,22 @@ class FakeWebSocketStream : public WebSocketStream { : protocol_(protocol), extensions_(extensions) {} virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_IO_PENDING; } - virtual void Close() OVERRIDE {} + virtual void Close() override {} // Returns the string passed to the constructor. - virtual std::string GetSubProtocol() const OVERRIDE { return protocol_; } + virtual std::string GetSubProtocol() const override { return protocol_; } // Returns the string passed to the constructor. - virtual std::string GetExtensions() const OVERRIDE { return extensions_; } + virtual std::string GetExtensions() const override { return extensions_; } private: // The string to return from GetSubProtocol(). @@ -493,7 +493,7 @@ class ReadableFakeWebSocketStream : public FakeWebSocketStream { } virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { CHECK(!read_frames_pending_); if (index_ >= responses_.size()) return ERR_IO_PENDING; @@ -550,7 +550,7 @@ class ReadableFakeWebSocketStream : public FakeWebSocketStream { class WriteableFakeWebSocketStream : public FakeWebSocketStream { public: virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return OK; } }; @@ -559,7 +559,7 @@ class WriteableFakeWebSocketStream : public FakeWebSocketStream { class UnWriteableFakeWebSocketStream : public FakeWebSocketStream { public: virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { return ERR_CONNECTION_RESET; } }; @@ -575,7 +575,7 @@ class EchoeyFakeWebSocketStream : public FakeWebSocketStream { EchoeyFakeWebSocketStream() : read_frames_(NULL), done_(false) {} virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { // Users of WebSocketStream will not expect the ReadFrames() callback to be // called from within WriteFrames(), so post it to the message loop instead. stored_frames_.insert(stored_frames_.end(), frames->begin(), frames->end()); @@ -585,7 +585,7 @@ class EchoeyFakeWebSocketStream : public FakeWebSocketStream { } virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { read_callback_ = callback; read_frames_ = frames; if (done_) @@ -648,7 +648,7 @@ class ResetOnWriteFakeWebSocketStream : public FakeWebSocketStream { ResetOnWriteFakeWebSocketStream() : closed_(false), weak_ptr_factory_(this) {} virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&ResetOnWriteFakeWebSocketStream::CallCallbackUnlessClosed, @@ -665,12 +665,12 @@ class ResetOnWriteFakeWebSocketStream : public FakeWebSocketStream { } virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { read_callback_ = callback; return ERR_IO_PENDING; } - virtual void Close() OVERRIDE { closed_ = true; } + virtual void Close() override { closed_ = true; } private: void CallCallbackUnlessClosed(const CompletionCallback& callback, int value) { @@ -736,8 +736,8 @@ std::vector<char> AsVector(const std::string& s) { class FakeSSLErrorCallbacks : public WebSocketEventInterface::SSLErrorCallbacks { public: - virtual void CancelSSLRequest(int error, const SSLInfo* ssl_info) OVERRIDE {} - virtual void ContinueSSLRequest() OVERRIDE {} + virtual void CancelSSLRequest(int error, const SSLInfo* ssl_info) override {} + virtual void ContinueSSLRequest() override {} }; // Base class for all test fixtures. @@ -850,7 +850,7 @@ class WebSocketChannelDeletingTest : public WebSocketChannelTest { EVENT_ON_SSL_CERTIFICATE_ERROR) {} // Create a ChannelDeletingFakeWebSocketEventInterface. Defined out-of-line to // avoid circular dependency. - virtual scoped_ptr<WebSocketEventInterface> CreateEventInterface() OVERRIDE; + virtual scoped_ptr<WebSocketEventInterface> CreateEventInterface() override; // Tests can set deleting_ to a bitmap of EventInterfaceCall members that they // want to cause Channel deletion. The default is for all calls to cause @@ -870,47 +870,47 @@ class ChannelDeletingFakeWebSocketEventInterface virtual ChannelState OnAddChannelResponse( bool fail, const std::string& selected_protocol, - const std::string& extensions) OVERRIDE { + const std::string& extensions) override { return fixture_->DeleteIfDeleting(EVENT_ON_ADD_CHANNEL_RESPONSE); } virtual ChannelState OnDataFrame(bool fin, WebSocketMessageType type, - const std::vector<char>& data) OVERRIDE { + const std::vector<char>& data) override { return fixture_->DeleteIfDeleting(EVENT_ON_DATA_FRAME); } - virtual ChannelState OnFlowControl(int64 quota) OVERRIDE { + virtual ChannelState OnFlowControl(int64 quota) override { return fixture_->DeleteIfDeleting(EVENT_ON_FLOW_CONTROL); } - virtual ChannelState OnClosingHandshake() OVERRIDE { + virtual ChannelState OnClosingHandshake() override { return fixture_->DeleteIfDeleting(EVENT_ON_CLOSING_HANDSHAKE); } - virtual ChannelState OnFailChannel(const std::string& message) OVERRIDE { + virtual ChannelState OnFailChannel(const std::string& message) override { return fixture_->DeleteIfDeleting(EVENT_ON_FAIL_CHANNEL); } virtual ChannelState OnDropChannel(bool was_clean, uint16 code, - const std::string& reason) OVERRIDE { + const std::string& reason) override { return fixture_->DeleteIfDeleting(EVENT_ON_DROP_CHANNEL); } virtual ChannelState OnStartOpeningHandshake( - scoped_ptr<WebSocketHandshakeRequestInfo> request) OVERRIDE { + scoped_ptr<WebSocketHandshakeRequestInfo> request) override { return fixture_->DeleteIfDeleting(EVENT_ON_START_OPENING_HANDSHAKE); } virtual ChannelState OnFinishOpeningHandshake( - scoped_ptr<WebSocketHandshakeResponseInfo> response) OVERRIDE { + scoped_ptr<WebSocketHandshakeResponseInfo> response) override { return fixture_->DeleteIfDeleting(EVENT_ON_FINISH_OPENING_HANDSHAKE); } virtual ChannelState OnSSLCertificateError( scoped_ptr<SSLErrorCallbacks> ssl_error_callbacks, const GURL& url, const SSLInfo& ssl_info, - bool fatal) OVERRIDE { + bool fatal) override { return fixture_->DeleteIfDeleting(EVENT_ON_SSL_CERTIFICATE_ERROR); } @@ -949,7 +949,7 @@ class WebSocketChannelEventInterfaceTest : public WebSocketChannelTest { // object before calling CreateChannelAndConnect() or // CreateChannelAndConnectSuccessfully(). This will only work once per test // case, but once should be enough. - virtual scoped_ptr<WebSocketEventInterface> CreateEventInterface() OVERRIDE { + virtual scoped_ptr<WebSocketEventInterface> CreateEventInterface() override { return scoped_ptr<WebSocketEventInterface>(event_interface_.release()); } @@ -963,7 +963,7 @@ class WebSocketChannelStreamTest : public WebSocketChannelTest { WebSocketChannelStreamTest() : mock_stream_(new StrictMock<MockWebSocketStream>) {} - virtual void CreateChannelAndConnectSuccessfully() OVERRIDE { + virtual void CreateChannelAndConnectSuccessfully() override { set_stream(mock_stream_.Pass()); WebSocketChannelTest::CreateChannelAndConnectSuccessfully(); } @@ -3317,7 +3317,7 @@ class WebSocketChannelStreamTimeoutTest : public WebSocketChannelStreamTest { protected: WebSocketChannelStreamTimeoutTest() {} - virtual void CreateChannelAndConnectSuccessfully() OVERRIDE { + virtual void CreateChannelAndConnectSuccessfully() override { set_stream(mock_stream_.Pass()); CreateChannelAndConnect(); channel_->SendFlowControl(kPlentyOfQuota); diff --git a/net/websockets/websocket_deflate_predictor_impl.h b/net/websockets/websocket_deflate_predictor_impl.h index 88a919c..d6b52c4 100644 --- a/net/websockets/websocket_deflate_predictor_impl.h +++ b/net/websockets/websocket_deflate_predictor_impl.h @@ -21,9 +21,9 @@ class NET_EXPORT_PRIVATE WebSocketDeflatePredictorImpl virtual ~WebSocketDeflatePredictorImpl() {} virtual Result Predict(const ScopedVector<WebSocketFrame>& frames, - size_t frame_index) OVERRIDE; - virtual void RecordInputDataFrame(const WebSocketFrame* frame) OVERRIDE; - virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) OVERRIDE; + size_t frame_index) override; + virtual void RecordInputDataFrame(const WebSocketFrame* frame) override; + virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) override; }; } // namespace net diff --git a/net/websockets/websocket_deflate_stream.h b/net/websockets/websocket_deflate_stream.h index 39ac2df..8f939ec1 100644 --- a/net/websockets/websocket_deflate_stream.h +++ b/net/websockets/websocket_deflate_stream.h @@ -47,12 +47,12 @@ class NET_EXPORT_PRIVATE WebSocketDeflateStream : public WebSocketStream { // WebSocketStream functions. virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE; + const CompletionCallback& callback) override; virtual int WriteFrames(ScopedVector<WebSocketFrame>* frames, - const CompletionCallback& callback) OVERRIDE; - virtual void Close() OVERRIDE; - virtual std::string GetSubProtocol() const OVERRIDE; - virtual std::string GetExtensions() const OVERRIDE; + const CompletionCallback& callback) override; + virtual void Close() override; + virtual std::string GetSubProtocol() const override; + virtual std::string GetExtensions() const override; private: enum ReadingState { diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc index 590f616..4f1c418 100644 --- a/net/websockets/websocket_deflate_stream_test.cc +++ b/net/websockets/websocket_deflate_stream_test.cc @@ -125,10 +125,10 @@ class WebSocketDeflatePredictorMock : public WebSocketDeflatePredictor { // WebSocketDeflatePredictor functions. virtual Result Predict(const ScopedVector<WebSocketFrame>& frames, - size_t frame_index) OVERRIDE { + size_t frame_index) override { return result_; } - virtual void RecordInputDataFrame(const WebSocketFrame* frame) OVERRIDE { + virtual void RecordInputDataFrame(const WebSocketFrame* frame) override { if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)) { ADD_FAILURE() << "Control frames should not be recorded."; return; @@ -147,7 +147,7 @@ class WebSocketDeflatePredictorMock : public WebSocketDeflatePredictor { } frames_to_be_input_.pop_front(); } - virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) OVERRIDE { + virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) override { if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)) { ADD_FAILURE() << "Control frames should not be recorded."; return; diff --git a/net/websockets/websocket_handshake_stream_create_helper.h b/net/websockets/websocket_handshake_stream_create_helper.h index fd9ab74..aad2644 100644 --- a/net/websockets/websocket_handshake_stream_create_helper.h +++ b/net/websockets/websocket_handshake_stream_create_helper.h @@ -38,12 +38,12 @@ class NET_EXPORT_PRIVATE WebSocketHandshakeStreamCreateHelper // Create a WebSocketBasicHandshakeStream. virtual WebSocketHandshakeStreamBase* CreateBasicStream( scoped_ptr<ClientSocketHandle> connection, - bool using_proxy) OVERRIDE; + bool using_proxy) override; // Unimplemented as of November 2013. virtual WebSocketHandshakeStreamBase* CreateSpdyStream( const base::WeakPtr<SpdySession>& session, - bool use_relative_url) OVERRIDE; + bool use_relative_url) override; // Call Upgrade() on the WebSocketHandshakeStream and return the result. This // must only be called if the handshake succeeded. diff --git a/net/websockets/websocket_handshake_stream_create_helper_test.cc b/net/websockets/websocket_handshake_stream_create_helper_test.cc index 88b868f..a776acd 100644 --- a/net/websockets/websocket_handshake_stream_create_helper_test.cc +++ b/net/websockets/websocket_handshake_stream_create_helper_test.cc @@ -61,17 +61,17 @@ class TestConnectDelegate : public WebSocketStream::ConnectDelegate { public: virtual ~TestConnectDelegate() {} - virtual void OnSuccess(scoped_ptr<WebSocketStream> stream) OVERRIDE {} - virtual void OnFailure(const std::string& failure_message) OVERRIDE {} + virtual void OnSuccess(scoped_ptr<WebSocketStream> stream) override {} + virtual void OnFailure(const std::string& failure_message) override {} virtual void OnStartOpeningHandshake( - scoped_ptr<WebSocketHandshakeRequestInfo> request) OVERRIDE {} + scoped_ptr<WebSocketHandshakeRequestInfo> request) override {} virtual void OnFinishOpeningHandshake( - scoped_ptr<WebSocketHandshakeResponseInfo> response) OVERRIDE {} + scoped_ptr<WebSocketHandshakeResponseInfo> response) override {} virtual void OnSSLCertificateError( scoped_ptr<WebSocketEventInterface::SSLErrorCallbacks> ssl_error_callbacks, const SSLInfo& ssl_info, - bool fatal) OVERRIDE {} + bool fatal) override {} }; class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test { diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h index 2e90a24..924fdd0 100644 --- a/net/websockets/websocket_job.h +++ b/net/websockets/websocket_job.h @@ -50,37 +50,37 @@ class NET_EXPORT WebSocketJob static void EnsureInit(); State state() const { return state_; } - virtual void Connect() OVERRIDE; - virtual bool SendData(const char* data, int len) OVERRIDE; - virtual void Close() OVERRIDE; - virtual void RestartWithAuth(const AuthCredentials& credentials) OVERRIDE; - virtual void DetachDelegate() OVERRIDE; + virtual void Connect() override; + virtual bool SendData(const char* data, int len) override; + virtual void Close() override; + virtual void RestartWithAuth(const AuthCredentials& credentials) override; + virtual void DetachDelegate() override; // SocketStream::Delegate methods. virtual int OnStartOpenConnection( - SocketStream* socket, const CompletionCallback& callback) OVERRIDE; + SocketStream* socket, const CompletionCallback& callback) override; virtual void OnConnected(SocketStream* socket, - int max_pending_send_allowed) OVERRIDE; - virtual void OnSentData(SocketStream* socket, int amount_sent) OVERRIDE; + int max_pending_send_allowed) override; + virtual void OnSentData(SocketStream* socket, int amount_sent) override; virtual void OnReceivedData(SocketStream* socket, const char* data, - int len) OVERRIDE; - virtual void OnClose(SocketStream* socket) OVERRIDE; + int len) override; + virtual void OnClose(SocketStream* socket) override; virtual void OnAuthRequired( - SocketStream* socket, AuthChallengeInfo* auth_info) OVERRIDE; + SocketStream* socket, AuthChallengeInfo* auth_info) override; virtual void OnSSLCertificateError(SocketStream* socket, const SSLInfo& ssl_info, - bool fatal) OVERRIDE; - virtual void OnError(const SocketStream* socket, int error) OVERRIDE; + bool fatal) override; + virtual void OnError(const SocketStream* socket, int error) override; // SpdyWebSocketStream::Delegate methods. - virtual void OnCreatedSpdyStream(int status) OVERRIDE; - virtual void OnSentSpdyHeaders() OVERRIDE; + virtual void OnCreatedSpdyStream(int status) override; + virtual void OnSentSpdyHeaders() override; virtual void OnSpdyResponseHeadersUpdated( - const SpdyHeaderBlock& response_headers) OVERRIDE; - virtual void OnSentSpdyData(size_t bytes_sent) OVERRIDE; - virtual void OnReceivedSpdyData(scoped_ptr<SpdyBuffer> buffer) OVERRIDE; - virtual void OnCloseSpdyStream() OVERRIDE; + const SpdyHeaderBlock& response_headers) override; + virtual void OnSentSpdyData(size_t bytes_sent) override; + virtual void OnReceivedSpdyData(scoped_ptr<SpdyBuffer> buffer) override; + virtual void OnCloseSpdyStream() override; private: friend class WebSocketThrottle; diff --git a/net/websockets/websocket_job_test.cc b/net/websockets/websocket_job_test.cc index 59d529a..9cf3144 100644 --- a/net/websockets/websocket_job_test.cc +++ b/net/websockets/websocket_job_test.cc @@ -45,18 +45,18 @@ class MockSocketStream : public SocketStream { URLRequestContext* context, CookieStore* cookie_store) : SocketStream(url, delegate, context, cookie_store) {} - virtual void Connect() OVERRIDE {} - virtual bool SendData(const char* data, int len) OVERRIDE { + virtual void Connect() override {} + virtual bool SendData(const char* data, int len) override { sent_data_ += std::string(data, len); return true; } - virtual void Close() OVERRIDE {} + virtual void Close() override {} virtual void RestartWithAuth( - const AuthCredentials& credentials) OVERRIDE { + const AuthCredentials& credentials) override { } - virtual void DetachDelegate() OVERRIDE { + virtual void DetachDelegate() override { delegate_ = NULL; } @@ -98,40 +98,40 @@ class MockSocketStreamDelegate : public SocketStream::Delegate { virtual int OnStartOpenConnection( SocketStream* socket, - const CompletionCallback& callback) OVERRIDE { + const CompletionCallback& callback) override { if (!on_start_open_connection_.is_null()) on_start_open_connection_.Run(); return OK; } virtual void OnConnected(SocketStream* socket, - int max_pending_send_allowed) OVERRIDE { + int max_pending_send_allowed) override { if (!on_connected_.is_null()) on_connected_.Run(); } virtual void OnSentData(SocketStream* socket, - int amount_sent) OVERRIDE { + int amount_sent) override { amount_sent_ += amount_sent; if (!on_sent_data_.is_null()) on_sent_data_.Run(); } virtual void OnReceivedData(SocketStream* socket, - const char* data, int len) OVERRIDE { + const char* data, int len) override { received_data_ += std::string(data, len); if (!on_received_data_.is_null()) on_received_data_.Run(); } - virtual void OnClose(SocketStream* socket) OVERRIDE { + virtual void OnClose(SocketStream* socket) override { if (!on_close_.is_null()) on_close_.Run(); } virtual bool CanGetCookies(SocketStream* socket, - const GURL& url) OVERRIDE { + const GURL& url) override { return allow_all_cookies_; } virtual bool CanSetCookie(SocketStream* request, const GURL& url, const std::string& cookie_line, - CookieOptions* options) OVERRIDE { + CookieOptions* options) override { return allow_all_cookies_; } @@ -190,7 +190,7 @@ class MockCookieStore : public CookieStore { const GURL& url, const std::string& cookie_line, const CookieOptions& options, - const SetCookiesCallback& callback) OVERRIDE { + const SetCookiesCallback& callback) override { bool result = SetCookieWithOptions(url, cookie_line, options); if (!callback.is_null()) callback.Run(result); @@ -199,27 +199,27 @@ class MockCookieStore : public CookieStore { virtual void GetCookiesWithOptionsAsync( const GURL& url, const CookieOptions& options, - const GetCookiesCallback& callback) OVERRIDE { + const GetCookiesCallback& callback) override { if (!callback.is_null()) callback.Run(GetCookiesWithOptions(url, options)); } virtual void GetAllCookiesForURLAsync( const GURL& url, - const GetCookieListCallback& callback) OVERRIDE { + const GetCookieListCallback& callback) override { ADD_FAILURE(); } virtual void DeleteCookieAsync(const GURL& url, const std::string& cookie_name, - const base::Closure& callback) OVERRIDE { + const base::Closure& callback) override { ADD_FAILURE(); } virtual void DeleteAllCreatedBetweenAsync( const base::Time& delete_begin, const base::Time& delete_end, - const DeleteCallback& callback) OVERRIDE { + const DeleteCallback& callback) override { ADD_FAILURE(); } @@ -227,15 +227,15 @@ class MockCookieStore : public CookieStore { const base::Time delete_begin, const base::Time delete_end, const GURL& url, - const DeleteCallback& callback) OVERRIDE { + const DeleteCallback& callback) override { ADD_FAILURE(); } - virtual void DeleteSessionCookiesAsync(const DeleteCallback&) OVERRIDE { + virtual void DeleteSessionCookiesAsync(const DeleteCallback&) override { ADD_FAILURE(); } - virtual CookieMonster* GetCookieMonster() OVERRIDE { return NULL; } + virtual CookieMonster* GetCookieMonster() override { return NULL; } const std::vector<Entry>& entries() const { return entries_; } @@ -248,7 +248,7 @@ class MockCookieStore : public CookieStore { class MockSSLConfigService : public SSLConfigService { public: - virtual void GetSSLConfig(SSLConfig* config) OVERRIDE {} + virtual void GetSSLConfig(SSLConfig* config) override {} protected: virtual ~MockSSLConfigService() {} @@ -298,17 +298,17 @@ class MockHttpTransactionFactory : public HttpTransactionFactory { virtual int CreateTransaction( RequestPriority priority, - scoped_ptr<HttpTransaction>* trans) OVERRIDE { + scoped_ptr<HttpTransaction>* trans) override { NOTREACHED(); return ERR_UNEXPECTED; } - virtual HttpCache* GetCache() OVERRIDE { + virtual HttpCache* GetCache() override { NOTREACHED(); return NULL; } - virtual HttpNetworkSession* GetSession() OVERRIDE { + virtual HttpNetworkSession* GetSession() override { return http_session_.get(); } @@ -350,34 +350,34 @@ class DeletingSocketStreamDelegate : public SocketStream::Delegate { // OnStartOpenConnection() is not implemented by SocketStreamDispatcherHost virtual void OnConnected(SocketStream* socket, - int max_pending_send_allowed) OVERRIDE { + int max_pending_send_allowed) override { DeleteJobMaybe(); } - virtual void OnSentData(SocketStream* socket, int amount_sent) OVERRIDE { + virtual void OnSentData(SocketStream* socket, int amount_sent) override { DeleteJobMaybe(); } virtual void OnReceivedData(SocketStream* socket, const char* data, - int len) OVERRIDE { + int len) override { DeleteJobMaybe(); } - virtual void OnClose(SocketStream* socket) OVERRIDE { DeleteJobMaybe(); } + virtual void OnClose(SocketStream* socket) override { DeleteJobMaybe(); } virtual void OnAuthRequired(SocketStream* socket, - AuthChallengeInfo* auth_info) OVERRIDE { + AuthChallengeInfo* auth_info) override { DeleteJobMaybe(); } virtual void OnSSLCertificateError(SocketStream* socket, const SSLInfo& ssl_info, - bool fatal) OVERRIDE { + bool fatal) override { DeleteJobMaybe(); } - virtual void OnError(const SocketStream* socket, int error) OVERRIDE { + virtual void OnError(const SocketStream* socket, int error) override { DeleteJobMaybe(); } @@ -398,12 +398,12 @@ class WebSocketJobTest : public PlatformTest, : spdy_util_(GetParam()), enable_websocket_over_spdy_(false) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { stream_type_ = STREAM_INVALID; cookie_store_ = new MockCookieStore; context_.reset(new MockURLRequestContext(cookie_store_.get())); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { cookie_store_ = NULL; context_.reset(); websocket_ = NULL; diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc index be2bc16..90cb7ca 100644 --- a/net/websockets/websocket_stream.cc +++ b/net/websockets/websocket_stream.cc @@ -56,7 +56,7 @@ class Delegate : public URLRequest::Delegate { // Implementation of URLRequest::Delegate methods. virtual void OnReceivedRedirect(URLRequest* request, const RedirectInfo& redirect_info, - bool* defer_redirect) OVERRIDE { + bool* defer_redirect) override { // HTTP status codes returned by HttpStreamParser are filtered by // WebSocketBasicHandshakeStream, and only 101, 401 and 407 are permitted // back up the stack to HttpNetworkTransaction. In particular, redirect @@ -65,20 +65,20 @@ class Delegate : public URLRequest::Delegate { NOTREACHED(); } - virtual void OnResponseStarted(URLRequest* request) OVERRIDE; + virtual void OnResponseStarted(URLRequest* request) override; virtual void OnAuthRequired(URLRequest* request, - AuthChallengeInfo* auth_info) OVERRIDE; + AuthChallengeInfo* auth_info) override; virtual void OnCertificateRequested(URLRequest* request, SSLCertRequestInfo* cert_request_info) - OVERRIDE; + override; virtual void OnSSLCertificateError(URLRequest* request, const SSLInfo& ssl_info, - bool fatal) OVERRIDE; + bool fatal) override; - virtual void OnReadCompleted(URLRequest* request, int bytes_read) OVERRIDE; + virtual void OnReadCompleted(URLRequest* request, int bytes_read) override; private: StreamRequestImpl* owner_; @@ -206,7 +206,7 @@ class SSLErrorCallbacks : public WebSocketEventInterface::SSLErrorCallbacks { explicit SSLErrorCallbacks(URLRequest* url_request) : url_request_(url_request) {} - virtual void CancelSSLRequest(int error, const SSLInfo* ssl_info) OVERRIDE { + virtual void CancelSSLRequest(int error, const SSLInfo* ssl_info) override { if (ssl_info) { url_request_->CancelWithSSLError(error, *ssl_info); } else { @@ -214,7 +214,7 @@ class SSLErrorCallbacks : public WebSocketEventInterface::SSLErrorCallbacks { } } - virtual void ContinueSSLRequest() OVERRIDE { + virtual void ContinueSSLRequest() override { url_request_->ContinueDespiteLastError(); } diff --git a/net/websockets/websocket_stream_test.cc b/net/websockets/websocket_stream_test.cc index c90777f..0b7ae4e 100644 --- a/net/websockets/websocket_stream_test.cc +++ b/net/websockets/websocket_stream_test.cc @@ -99,7 +99,7 @@ class DeterministicKeyWebSocketHandshakeStreamCreateHelper : WebSocketHandshakeStreamCreateHelper(connect_delegate, requested_subprotocols) {} - virtual void OnStreamCreated(WebSocketBasicHandshakeStream* stream) OVERRIDE { + virtual void OnStreamCreated(WebSocketBasicHandshakeStream* stream) override { stream->SetWebSocketKeyForTesting("dGhlIHNhbXBsZSBub25jZQ=="); } }; @@ -201,23 +201,23 @@ class WebSocketStreamCreateTest : public ::testing::Test { explicit TestConnectDelegate(WebSocketStreamCreateTest* owner) : owner_(owner) {} - virtual void OnSuccess(scoped_ptr<WebSocketStream> stream) OVERRIDE { + virtual void OnSuccess(scoped_ptr<WebSocketStream> stream) override { stream.swap(owner_->stream_); } - virtual void OnFailure(const std::string& message) OVERRIDE { + virtual void OnFailure(const std::string& message) override { owner_->has_failed_ = true; owner_->failure_message_ = message; } virtual void OnStartOpeningHandshake( - scoped_ptr<WebSocketHandshakeRequestInfo> request) OVERRIDE { + scoped_ptr<WebSocketHandshakeRequestInfo> request) override { // Can be called multiple times (in the case of HTTP auth). Last call // wins. owner_->request_info_ = request.Pass(); } virtual void OnFinishOpeningHandshake( - scoped_ptr<WebSocketHandshakeResponseInfo> response) OVERRIDE { + scoped_ptr<WebSocketHandshakeResponseInfo> response) override { if (owner_->response_info_) ADD_FAILURE(); owner_->response_info_ = response.Pass(); @@ -226,7 +226,7 @@ class WebSocketStreamCreateTest : public ::testing::Test { scoped_ptr<WebSocketEventInterface::SSLErrorCallbacks> ssl_error_callbacks, const SSLInfo& ssl_info, - bool fatal) OVERRIDE { + bool fatal) override { owner_->ssl_error_callbacks_ = ssl_error_callbacks.Pass(); owner_->ssl_info_ = ssl_info; owner_->ssl_fatal_ = fatal; @@ -408,7 +408,7 @@ class WebSocketStreamCreateUMATest : public ::testing::Test { }; class StreamCreation : public WebSocketStreamCreateTest { - virtual void TestBody() OVERRIDE {} + virtual void TestBody() override {} }; scoped_ptr<base::HistogramSamples> GetSamples(const std::string& name) { diff --git a/net/websockets/websocket_throttle_test.cc b/net/websockets/websocket_throttle_test.cc index 4d93001..a743e93 100644 --- a/net/websockets/websocket_throttle_test.cc +++ b/net/websockets/websocket_throttle_test.cc @@ -25,12 +25,12 @@ class DummySocketStreamDelegate : public SocketStream::Delegate { DummySocketStreamDelegate() {} virtual ~DummySocketStreamDelegate() {} virtual void OnConnected( - SocketStream* socket, int max_pending_send_allowed) OVERRIDE {} + SocketStream* socket, int max_pending_send_allowed) override {} virtual void OnSentData(SocketStream* socket, - int amount_sent) OVERRIDE {} + int amount_sent) override {} virtual void OnReceivedData(SocketStream* socket, - const char* data, int len) OVERRIDE {} - virtual void OnClose(SocketStream* socket) OVERRIDE {} + const char* data, int len) override {} + virtual void OnClose(SocketStream* socket) override {} }; class WebSocketThrottleTestContext : public TestURLRequestContext { |