summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhans <hans@chromium.org>2015-02-24 14:14:54 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-24 22:15:41 +0000
commitf9fdda033eb8ccb8ce18649c8aaeb28175ad0e6a (patch)
tree682eaf8be137e7e77e1745030e1cb5577392d12a /media
parentc27716a1c371d9f56a48656225c77ad7bacebfd1 (diff)
downloadchromium_src-f9fdda033eb8ccb8ce18649c8aaeb28175ad0e6a.zip
chromium_src-f9fdda033eb8ccb8ce18649c8aaeb28175ad0e6a.tar.gz
chromium_src-f9fdda033eb8ccb8ce18649c8aaeb28175ad0e6a.tar.bz2
Fix some virtual and override specifiers
The new Clang plugin is more picky. BUG=444089, 459607 NOTRY=true Review URL: https://codereview.chromium.org/943893006 Cr-Commit-Position: refs/heads/master@{#317899}
Diffstat (limited to 'media')
-rw-r--r--media/blink/run_all_unittests.cc4
-rw-r--r--media/blink/video_frame_compositor_unittest.cc8
2 files changed, 6 insertions, 6 deletions
diff --git a/media/blink/run_all_unittests.cc b/media/blink/run_all_unittests.cc
index 83c75d6..62b7120 100644
--- a/media/blink/run_all_unittests.cc
+++ b/media/blink/run_all_unittests.cc
@@ -41,10 +41,10 @@ const unsigned char* TestBlinkPlatformSupport::getTraceCategoryEnabledFlag(
class BlinkMediaTestSuite : public base::TestSuite {
public:
BlinkMediaTestSuite(int argc, char** argv);
- virtual ~BlinkMediaTestSuite();
+ ~BlinkMediaTestSuite() override;
protected:
- virtual void Initialize() override;
+ void Initialize() override;
private:
scoped_ptr<TestBlinkPlatformSupport> blink_platform_support_;
diff --git a/media/blink/video_frame_compositor_unittest.cc b/media/blink/video_frame_compositor_unittest.cc
index 4bceb24..43d750a 100644
--- a/media/blink/video_frame_compositor_unittest.cc
+++ b/media/blink/video_frame_compositor_unittest.cc
@@ -26,7 +26,7 @@ class VideoFrameCompositorTest : public testing::Test,
compositor_->SetVideoFrameProviderClient(this);
}
- virtual ~VideoFrameCompositorTest() {
+ ~VideoFrameCompositorTest() override {
compositor_->SetVideoFrameProviderClient(NULL);
}
@@ -40,11 +40,11 @@ class VideoFrameCompositorTest : public testing::Test,
private:
// cc::VideoFrameProvider::Client implementation.
- virtual void StopUsingProvider() override {}
- virtual void DidReceiveFrame() override {
+ void StopUsingProvider() override {}
+ void DidReceiveFrame() override {
++did_receive_frame_count_;
}
- virtual void DidUpdateMatrix(const float* matrix) override {}
+ void DidUpdateMatrix(const float* matrix) override {}
void NaturalSizeChanged(gfx::Size natural_size) {
++natural_size_changed_count_;