summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-07 08:11:54 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-07 16:13:09 +0000
commit50e3df675d58385e566645effb6ccfd3c8562443 (patch)
tree6519f875491e57f5795bd68fc3249303a3a33d98 /media
parentb2d3d602cd213055bb54117152926c9989e3938f (diff)
downloadchromium_src-50e3df675d58385e566645effb6ccfd3c8562443.zip
chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.tar.gz
chromium_src-50e3df675d58385e566645effb6ccfd3c8562443.tar.bz2
Revert of Enforce marking "override" for functions overriding Blink. (patchset #19 id:360001 of https://codereview.chromium.org/1370923002/ )
Reason for revert: Missed one. Original issue's description: > Enforce marking "override" for functions overriding Blink. > > BUG=535367 > TEST=it all stays working > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > TBR=ben@chromium.org > > Committed: https://crrev.com/32ff552858e014d454ce8b181f5aca1dfcf8f8fd > Cr-Commit-Position: refs/heads/master@{#363482} TBR=thakis@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=535367 Review URL: https://codereview.chromium.org/1504913002 Cr-Commit-Position: refs/heads/master@{#363492}
Diffstat (limited to 'media')
-rw-r--r--media/blink/multibuffer_data_source_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc
index 3890af9..661840d 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -47,7 +47,7 @@ class TestMultiBufferDataProvider : public ResourceMultiBufferDataProvider {
: ResourceMultiBufferDataProvider(url_data, pos), loading_(false) {
CHECK(test_data_providers.insert(this).second);
}
- ~TestMultiBufferDataProvider() override {
+ ~TestMultiBufferDataProvider() {
CHECK_EQ(static_cast<size_t>(1), test_data_providers.erase(this));
}
void Start() override {