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

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (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
« no previous file with comments | « media/filters/opus_audio_decoder.h ('k') | media/filters/pipeline_integration_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 27e6344b72813bea4e56bab0f8efe5c2eee32645..ea3ff4490d62c81effb8cbceee824e368eb134fc 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -233,25 +233,25 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
virtual void OnSessionMessage(const std::string& web_session_id,
const std::vector<uint8>& message,
- const GURL& destination_url) OVERRIDE {
+ const GURL& destination_url) override {
EXPECT_FALSE(web_session_id.empty());
EXPECT_FALSE(message.empty());
EXPECT_EQ(current_session_id_, web_session_id);
}
- virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE {
+ virtual void OnSessionClosed(const std::string& web_session_id) override {
EXPECT_EQ(current_session_id_, web_session_id);
}
virtual void OnSessionKeysChange(const std::string& web_session_id,
- bool has_additional_usable_key) OVERRIDE {
+ bool has_additional_usable_key) override {
EXPECT_EQ(current_session_id_, web_session_id);
EXPECT_EQ(has_additional_usable_key, true);
}
virtual void NeedKey(const std::string& type,
const std::vector<uint8>& init_data,
- AesDecryptor* decryptor) OVERRIDE {
+ AesDecryptor* decryptor) override {
if (current_session_id_.empty()) {
decryptor->CreateSession(type,
kInitData,
@@ -293,7 +293,7 @@ class RotatingKeyProvidingApp : public KeyProvidingApp {
virtual void NeedKey(const std::string& type,
const std::vector<uint8>& init_data,
- AesDecryptor* decryptor) OVERRIDE {
+ AesDecryptor* decryptor) override {
// Skip the request if the |init_data| has been seen.
if (init_data == prev_init_data_)
return;
@@ -360,26 +360,26 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
public:
virtual void OnSessionMessage(const std::string& web_session_id,
const std::vector<uint8>& message,
- const GURL& default_url) OVERRIDE {
+ const GURL& default_url) override {
EXPECT_FALSE(web_session_id.empty());
EXPECT_FALSE(message.empty());
FAIL() << "Unexpected Message";
}
- virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE {
+ virtual void OnSessionClosed(const std::string& web_session_id) override {
EXPECT_FALSE(web_session_id.empty());
FAIL() << "Unexpected Closed";
}
virtual void OnSessionKeysChange(const std::string& web_session_id,
- bool has_additional_usable_key) OVERRIDE {
+ bool has_additional_usable_key) override {
EXPECT_FALSE(web_session_id.empty());
EXPECT_EQ(has_additional_usable_key, true);
}
virtual void NeedKey(const std::string& type,
const std::vector<uint8>& init_data,
- AesDecryptor* decryptor) OVERRIDE {
+ AesDecryptor* decryptor) override {
}
};
« no previous file with comments | « media/filters/opus_audio_decoder.h ('k') | media/filters/pipeline_integration_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698