Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(440)

Unified Diff: components/invalidation/gcm_network_channel_unittest.cc

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/invalidation/gcm_network_channel_unittest.cc
diff --git a/components/invalidation/gcm_network_channel_unittest.cc b/components/invalidation/gcm_network_channel_unittest.cc
index a974b838b6c75ee424b967421c88976b564d5483..94cd3d2e3eb11a0cb527f5489bb93b0f220972eb 100644
--- a/components/invalidation/gcm_network_channel_unittest.cc
+++ b/components/invalidation/gcm_network_channel_unittest.cc
@@ -18,24 +18,24 @@ class TestGCMNetworkChannelDelegate : public GCMNetworkChannelDelegate {
: register_call_count_(0) {}
virtual void Initialize(
- GCMNetworkChannelDelegate::ConnectionStateCallback callback) OVERRIDE {
+ GCMNetworkChannelDelegate::ConnectionStateCallback callback) override {
connection_state_callback = callback;
}
- virtual void RequestToken(RequestTokenCallback callback) OVERRIDE {
+ virtual void RequestToken(RequestTokenCallback callback) override {
request_token_callback = callback;
}
- virtual void InvalidateToken(const std::string& token) OVERRIDE {
+ virtual void InvalidateToken(const std::string& token) override {
invalidated_token = token;
}
- virtual void Register(RegisterCallback callback) OVERRIDE {
+ virtual void Register(RegisterCallback callback) override {
++register_call_count_;
register_callback = callback;
}
- virtual void SetMessageReceiver(MessageCallback callback) OVERRIDE {
+ virtual void SetMessageReceiver(MessageCallback callback) override {
message_callback = callback;
}
@@ -86,7 +86,7 @@ class TestGCMNetworkChannel : public GCMNetworkChannel {
protected:
// On Android GCMNetworkChannel::BuildUrl hits NOTREACHED(). I still want
// tests to run.
- virtual GURL BuildUrl(const std::string& registration_id) OVERRIDE {
+ virtual GURL BuildUrl(const std::string& registration_id) override {
return GURL("http://test.url.com");
}
};
@@ -110,7 +110,7 @@ class TestNetworkChannelURLFetcher : public net::FakeURLFetcher {
status),
test_(test) {}
- virtual void AddExtraRequestHeader(const std::string& header_line) OVERRIDE;
+ virtual void AddExtraRequestHeader(const std::string& header_line) override;
private:
GCMNetworkChannelTest* test_;
@@ -167,7 +167,7 @@ class GCMNetworkChannelTest
}
virtual void OnNetworkChannelStateChanged(
- InvalidatorState invalidator_state) OVERRIDE {
+ InvalidatorState invalidator_state) override {
last_invalidator_state_ = invalidator_state;
}
« no previous file with comments | « components/invalidation/gcm_network_channel.h ('k') | components/invalidation/invalidation_logger_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698