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

Unified Diff: media/formats/mp4/box_reader_unittest.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/formats/mp4/box_definitions.h ('k') | media/formats/mp4/mp4_stream_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp4/box_reader_unittest.cc
diff --git a/media/formats/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc
index 77729b61be7098a7602957e92344451746ac2c49..72a7765fdf8ad6d1e29cf06fada49d79f9cd78fa 100644
--- a/media/formats/mp4/box_reader_unittest.cc
+++ b/media/formats/mp4/box_reader_unittest.cc
@@ -31,19 +31,19 @@ static const uint8 kSkipBox[] = {
0x00 };
struct FreeBox : Box {
- virtual bool Parse(BoxReader* reader) OVERRIDE {
+ virtual bool Parse(BoxReader* reader) override {
return true;
}
- virtual FourCC BoxType() const OVERRIDE { return FOURCC_FREE; }
+ virtual FourCC BoxType() const override { return FOURCC_FREE; }
};
struct PsshBox : Box {
uint32 val;
- virtual bool Parse(BoxReader* reader) OVERRIDE {
+ virtual bool Parse(BoxReader* reader) override {
return reader->Read4(&val);
}
- virtual FourCC BoxType() const OVERRIDE { return FOURCC_PSSH; }
+ virtual FourCC BoxType() const override { return FOURCC_PSSH; }
};
struct SkipBox : Box {
@@ -55,7 +55,7 @@ struct SkipBox : Box {
std::vector<PsshBox> kids;
FreeBox mpty;
- virtual bool Parse(BoxReader* reader) OVERRIDE {
+ virtual bool Parse(BoxReader* reader) override {
RCHECK(reader->ReadFullBoxHeader() &&
reader->Read1(&a) &&
reader->Read1(&b) &&
@@ -66,7 +66,7 @@ struct SkipBox : Box {
reader->ReadChildren(&kids) &&
reader->MaybeReadChild(&mpty);
}
- virtual FourCC BoxType() const OVERRIDE { return FOURCC_SKIP; }
+ virtual FourCC BoxType() const override { return FOURCC_SKIP; }
SkipBox();
virtual ~SkipBox();
« no previous file with comments | « media/formats/mp4/box_definitions.h ('k') | media/formats/mp4/mp4_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698