Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
[email protected]
Review URL: https://codereview.chromium.org/686523002
Cr-Commit-Position: refs/heads/master@{#301771}
diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
index 18c9a59..a0e9d91 100644
--- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc
@@ -45,7 +45,7 @@
return static_cast<RenderFrameImpl*>(view()->GetMainRenderFrame());
}
- virtual void SetUp() {
+ void SetUp() override {
RenderViewTest::SetUp();
sink_ = &render_thread_->sink();
}
diff --git a/content/renderer/accessibility/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h
index 3f33c08..963e38a 100644
--- a/content/renderer/accessibility/renderer_accessibility_complete.h
+++ b/content/renderer/accessibility/renderer_accessibility_complete.h
@@ -47,7 +47,7 @@
blink::WebAXEvent event) override;
RendererAccessibilityType GetType() override;
void FocusedNodeChanged(const blink::WebNode& node) override;
- virtual void DisableAccessibility() override;
+ void DisableAccessibility() override;
void HandleAXEvent(const blink::WebAXObject& obj, ui::AXEvent event);
diff --git a/content/renderer/device_sensors/device_light_event_pump_unittest.cc b/content/renderer/device_sensors/device_light_event_pump_unittest.cc
index 59569f52..dadc4e3 100644
--- a/content/renderer/device_sensors/device_light_event_pump_unittest.cc
+++ b/content/renderer/device_sensors/device_light_event_pump_unittest.cc
@@ -66,7 +66,7 @@
}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
const DeviceLightHardwareBuffer* null_buffer = NULL;
listener_.reset(new MockDeviceLightListener);
light_pump_.reset(new DeviceLightEventPumpForTesting);
diff --git a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
index bb22747..13b204f5 100644
--- a/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
+++ b/content/renderer/device_sensors/device_motion_event_pump_unittest.cc
@@ -70,7 +70,7 @@
}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
const DeviceMotionHardwareBuffer* null_buffer = NULL;
listener_.reset(new MockDeviceMotionListener);
motion_pump_.reset(new DeviceMotionEventPumpForTesting);
diff --git a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
index f21071b..35792f9 100644
--- a/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
+++ b/content/renderer/device_sensors/device_orientation_event_pump_unittest.cc
@@ -73,7 +73,7 @@
}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
const DeviceOrientationHardwareBuffer* null_buffer = NULL;
listener_.reset(new MockDeviceOrientationListener);
orientation_pump_.reset(new DeviceOrientationEventPumpForTesting);
diff --git a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc
index 74294587..f17f5fe 100644
--- a/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc
+++ b/content/renderer/dom_storage/dom_storage_cached_area_unittest.cc
@@ -130,9 +130,7 @@
const base::string16 kValue;
const GURL kPageUrl;
- virtual void SetUp() {
- mock_proxy_ = new MockProxy();
- }
+ void SetUp() override { mock_proxy_ = new MockProxy(); }
bool IsPrimed(DOMStorageCachedArea* cached_area) {
return cached_area->map_.get();
diff --git a/content/renderer/gin_browsertest.cc b/content/renderer/gin_browsertest.cc
index 11a6ae9..58fccd9f 100644
--- a/content/renderer/gin_browsertest.cc
+++ b/content/renderer/gin_browsertest.cc
@@ -40,9 +40,9 @@
class GinBrowserTest : public RenderViewTest {
public:
GinBrowserTest() {}
- virtual ~GinBrowserTest() {}
+ ~GinBrowserTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kJavaScriptFlags, "--expose_gc");
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.h b/content/renderer/gpu/gpu_benchmarking_extension.h
index d657e91..d4736dd 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.h
+++ b/content/renderer/gpu/gpu_benchmarking_extension.h
@@ -33,10 +33,10 @@
private:
GpuBenchmarking();
- virtual ~GpuBenchmarking();
+ ~GpuBenchmarking() override;
// gin::Wrappable.
- virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
+ gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
v8::Isolate* isolate) override;
// JavaScript handlers.
diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
index f8886421..101055e 100644
--- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc
+++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
@@ -60,7 +60,7 @@
: frame_swap_message_queue_(new FrameSwapMessageQueue()),
sync_message_filter_(new TestSyncMessageFilter()) {}
- virtual ~QueueMessageSwapPromiseTest() {}
+ ~QueueMessageSwapPromiseTest() override {}
scoped_ptr<cc::SwapPromise> QueueMessageImpl(IPC::Message* msg,
MessageDeliveryPolicy policy,
diff --git a/content/renderer/gpu/render_widget_compositor_unittest.cc b/content/renderer/gpu/render_widget_compositor_unittest.cc
index 0dbbb204..94c5baf6 100644
--- a/content/renderer/gpu/render_widget_compositor_unittest.cc
+++ b/content/renderer/gpu/render_widget_compositor_unittest.cc
@@ -46,7 +46,7 @@
: render_widget_(make_scoped_refptr(new TestRenderWidget())),
render_widget_compositor_(
RenderWidgetCompositor::Create(render_widget_.get(), false)) {}
- virtual ~RenderWidgetCompositorTest() {}
+ ~RenderWidgetCompositorTest() override {}
protected:
MockRenderThread render_thread_;
diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc
index ab6111d7..b7befdb 100644
--- a/content/renderer/input/input_event_filter_unittest.cc
+++ b/content/renderer/input/input_event_filter_unittest.cc
@@ -125,7 +125,7 @@
class InputEventFilterTest : public testing::Test {
public:
- virtual void SetUp() override {
+ void SetUp() override {
filter_ = new InputEventFilter(&message_recorder_,
base::MessageLoopProxy::current(),
message_loop_.message_loop_proxy());
diff --git a/content/renderer/manifest/manifest_parser_unittest.cc b/content/renderer/manifest/manifest_parser_unittest.cc
index 7212756..1e3770b 100644
--- a/content/renderer/manifest/manifest_parser_unittest.cc
+++ b/content/renderer/manifest/manifest_parser_unittest.cc
@@ -13,7 +13,7 @@
class ManifestParserTest : public testing::Test {
protected:
ManifestParserTest() {}
- virtual ~ManifestParserTest() {}
+ ~ManifestParserTest() override {}
Manifest ParseManifest(const base::StringPiece& json,
const GURL& document_url = default_document_url,
diff --git a/content/renderer/media/crypto/key_systems_unittest.cc b/content/renderer/media/crypto/key_systems_unittest.cc
index 742dc00..d7c980dd 100644
--- a/content/renderer/media/crypto/key_systems_unittest.cc
+++ b/content/renderer/media/crypto/key_systems_unittest.cc
@@ -164,11 +164,9 @@
SetRendererClientForTesting(&content_renderer_client_);
}
- virtual void SetUp() override {
- AddContainerAndCodecMasksForTest();
- }
+ void SetUp() override { AddContainerAndCodecMasksForTest(); }
- virtual ~KeySystemsTest() {
+ ~KeySystemsTest() override {
// Clear the use of content_client_, which was set in SetUp().
SetContentClient(NULL);
}
diff --git a/content/renderer/media/media_stream_video_capture_source_unittest.cc b/content/renderer/media/media_stream_video_capture_source_unittest.cc
index 926a57c..038acef 100644
--- a/content/renderer/media/media_stream_video_capture_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_capture_source_unittest.cc
@@ -42,7 +42,7 @@
source_stopped_(false) {
}
- virtual void TearDown() override {
+ void TearDown() override {
webkit_source_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
diff --git a/content/renderer/media/media_stream_video_source_unittest.cc b/content/renderer/media/media_stream_video_source_unittest.cc
index f34c98a..15ba109 100644
--- a/content/renderer/media/media_stream_video_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_source_unittest.cc
@@ -56,7 +56,7 @@
webkit_source_.setExtraData(mock_source_);
}
- virtual void TearDown() {
+ void TearDown() override {
webkit_source_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
diff --git a/content/renderer/media/media_stream_video_track_unittest.cc b/content/renderer/media/media_stream_video_track_unittest.cc
index caf55671..4c319ac 100644
--- a/content/renderer/media/media_stream_video_track_unittest.cc
+++ b/content/renderer/media/media_stream_video_track_unittest.cc
@@ -38,10 +38,9 @@
blink_source_.setExtraData(mock_source_);
}
- virtual ~MediaStreamVideoTrackTest() {
- }
+ ~MediaStreamVideoTrackTest() override {}
- virtual void TearDown() override {
+ void TearDown() override {
blink_source_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
diff --git a/content/renderer/media/render_media_log_unittest.cc b/content/renderer/media/render_media_log_unittest.cc
index 83708aa..a5d25cee 100644
--- a/content/renderer/media/render_media_log_unittest.cc
+++ b/content/renderer/media/render_media_log_unittest.cc
@@ -18,7 +18,7 @@
log_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_));
}
- virtual ~RenderMediaLogTest() {}
+ ~RenderMediaLogTest() override {}
void AddEvent(media::MediaLogEvent::Type type) {
log_->AddEvent(log_->CreateEvent(type));
diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
index aac5342..247fcc12 100644
--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -199,7 +199,7 @@
child_process_.reset(new ChildProcess());
}
- virtual void SetUp() {
+ void SetUp() override {
mock_client_.reset(new NiceMock<MockWebRTCPeerConnectionHandlerClient>());
mock_dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
pc_handler_.reset(
@@ -215,7 +215,7 @@
ASSERT_TRUE(mock_peer_connection_);
}
- virtual void TearDown() {
+ void TearDown() override {
pc_handler_.reset();
mock_tracker_.reset();
mock_dependency_factory_.reset();
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index 3c43e76..4500355 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -31,7 +31,7 @@
memset(&codec_, 0, sizeof(codec_));
}
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(vda_thread_.Start());
vda_task_runner_ = vda_thread_.message_loop_proxy();
mock_vda_ = new media::MockVideoDecodeAccelerator;
@@ -47,7 +47,7 @@
EXPECT_CALL(*mock_vda_, Destroy()).Times(1);
}
- virtual void TearDown() override {
+ void TearDown() override {
VLOG(2) << "TearDown";
EXPECT_TRUE(vda_thread_.IsRunning());
RunUntilIdle(); // Wait until all callbascks complete.
diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc
index 02fcfe0..35c41a06 100644
--- a/content/renderer/media/user_media_client_impl_unittest.cc
+++ b/content/renderer/media/user_media_client_impl_unittest.cc
@@ -160,7 +160,7 @@
class UserMediaClientImplTest : public ::testing::Test {
public:
- virtual void SetUp() {
+ void SetUp() override {
// Create our test object.
child_process_.reset(new ChildProcess());
dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
@@ -170,7 +170,7 @@
scoped_ptr<MediaStreamDispatcher>(ms_dispatcher_).Pass()));
}
- virtual void TearDown() override {
+ void TearDown() override {
used_media_impl_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
diff --git a/content/renderer/media/video_source_handler_unittest.cc b/content/renderer/media/video_source_handler_unittest.cc
index edffd1f02..31c96fe 100644
--- a/content/renderer/media/video_source_handler_unittest.cc
+++ b/content/renderer/media/video_source_handler_unittest.cc
@@ -49,7 +49,7 @@
registry_->AddVideoTrack(kTestVideoTrackId);
}
- virtual void TearDown() {
+ void TearDown() override {
registry_.reset();
handler_.reset();
blink::WebHeap::collectAllGarbageForTesting();
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc b/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc
index 15b03f39..4d9d7eb 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source_unittest.cc
@@ -49,7 +49,7 @@
webkit_source_.setExtraData(remote_source_);
}
- virtual void TearDown() override {
+ void TearDown() override {
webkit_source_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc
index e001c02a..dcf1b13 100644
--- a/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc
+++ b/content/renderer/media/webrtc/media_stream_track_metrics_unittest.cc
@@ -78,12 +78,12 @@
class MediaStreamTrackMetricsTest : public testing::Test {
public:
- virtual void SetUp() override {
+ void SetUp() override {
metrics_.reset(new MockMediaStreamTrackMetrics());
stream_ = new rtc::RefCountedObject<MockMediaStream>("stream");
}
- virtual void TearDown() override {
+ void TearDown() override {
metrics_.reset();
stream_ = NULL;
}
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory_unittest.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory_unittest.cc
index 72f564e..d93cd15 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory_unittest.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory_unittest.cc
@@ -11,7 +11,7 @@
class PeerConnectionDependencyFactoryTest : public ::testing::Test {
public:
- virtual void SetUp() {
+ void SetUp() override {
dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
}
diff --git a/content/renderer/media/webrtc/video_destination_handler_unittest.cc b/content/renderer/media/webrtc/video_destination_handler_unittest.cc
index 46923e76..806b6f4 100644
--- a/content/renderer/media/webrtc/video_destination_handler_unittest.cc
+++ b/content/renderer/media/webrtc/video_destination_handler_unittest.cc
@@ -41,7 +41,7 @@
registry_->Init(kTestStreamUrl);
}
- virtual void TearDown() override {
+ void TearDown() override {
registry_.reset();
blink::WebHeap::collectAllGarbageForTesting();
PpapiUnittest::TearDown();
diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
index c7afce6..184240c 100644
--- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc
@@ -45,7 +45,7 @@
}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
track_->OnSetFormat(params_);
EXPECT_TRUE(track_->GetAudioAdapter()->enabled());
}
diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
index 78e67fc..3d5a39b4 100644
--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
@@ -24,12 +24,12 @@
class WebRtcMediaStreamAdapterTest : public ::testing::Test {
public:
- virtual void SetUp() {
+ void SetUp() override {
child_process_.reset(new ChildProcess());
dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
}
- virtual void TearDown() override {
+ void TearDown() override {
adapter_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index 7d1cb4f..06533e53 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -38,97 +38,97 @@
base::Bind(&ReleaseOriginalFrame, frame))),
elapsed_time_(elapsed_time) {}
- virtual VideoFrame* Copy() const override {
+ VideoFrame* Copy() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return new VideoFrameWrapper(frame_, elapsed_time_);
}
- virtual size_t GetWidth() const override {
+ size_t GetWidth() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return static_cast<size_t>(frame_->visible_rect().width());
}
- virtual size_t GetHeight() const override {
+ size_t GetHeight() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return static_cast<size_t>(frame_->visible_rect().height());
}
- virtual const uint8* GetYPlane() const override {
+ const uint8* GetYPlane() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->visible_data(media::VideoFrame::kYPlane);
}
- virtual const uint8* GetUPlane() const override {
+ const uint8* GetUPlane() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->visible_data(media::VideoFrame::kUPlane);
}
- virtual const uint8* GetVPlane() const override {
+ const uint8* GetVPlane() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->visible_data(media::VideoFrame::kVPlane);
}
- virtual uint8* GetYPlane() override {
+ uint8* GetYPlane() override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->visible_data(media::VideoFrame::kYPlane);
}
- virtual uint8* GetUPlane() override {
+ uint8* GetUPlane() override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->visible_data(media::VideoFrame::kUPlane);
}
- virtual uint8* GetVPlane() override {
+ uint8* GetVPlane() override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->visible_data(media::VideoFrame::kVPlane);
}
- virtual int32 GetYPitch() const override {
+ int32 GetYPitch() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->stride(media::VideoFrame::kYPlane);
}
- virtual int32 GetUPitch() const override {
+ int32 GetUPitch() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->stride(media::VideoFrame::kUPlane);
}
- virtual int32 GetVPitch() const override {
+ int32 GetVPitch() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->stride(media::VideoFrame::kVPlane);
}
- virtual void* GetNativeHandle() const override {
+ void* GetNativeHandle() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return NULL;
}
- virtual size_t GetPixelWidth() const override {
+ size_t GetPixelWidth() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return 1;
}
- virtual size_t GetPixelHeight() const override {
+ size_t GetPixelHeight() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return 1;
}
- virtual int64 GetElapsedTime() const override {
+ int64 GetElapsedTime() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return elapsed_time_;
}
- virtual int64 GetTimeStamp() const override {
+ int64 GetTimeStamp() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return frame_->timestamp().InMicroseconds() *
base::Time::kNanosecondsPerMicrosecond;
}
- virtual void SetElapsedTime(int64 elapsed_time) override {
+ void SetElapsedTime(int64 elapsed_time) override {
DCHECK(thread_checker_.CalledOnValidThread());
elapsed_time_ = elapsed_time;
}
- virtual void SetTimeStamp(int64 time_stamp) override {
+ void SetTimeStamp(int64 time_stamp) override {
DCHECK(thread_checker_.CalledOnValidThread());
// Round to closest microsecond.
frame_->set_timestamp(base::TimeDelta::FromMicroseconds(
@@ -136,16 +136,16 @@
base::Time::kNanosecondsPerMicrosecond));
}
- virtual int GetRotation() const override {
+ int GetRotation() const override {
DCHECK(thread_checker_.CalledOnValidThread());
return 0;
}
// TODO(magjed): Refactor into base class.
- virtual size_t ConvertToRgbBuffer(uint32 to_fourcc,
- uint8* buffer,
- size_t size,
- int stride_rgb) const override {
+ size_t ConvertToRgbBuffer(uint32 to_fourcc,
+ uint8* buffer,
+ size_t size,
+ int stride_rgb) const override {
DCHECK(thread_checker_.CalledOnValidThread());
const size_t needed = std::abs(stride_rgb) * GetHeight();
if (size < needed) {
@@ -171,50 +171,50 @@
}
// The rest of the public methods are NOTIMPLEMENTED.
- virtual bool InitToBlack(int w,
- int h,
- size_t pixel_width,
- size_t pixel_height,
- int64 elapsed_time,
- int64 time_stamp) override {
+ bool InitToBlack(int w,
+ int h,
+ size_t pixel_width,
+ size_t pixel_height,
+ int64 elapsed_time,
+ int64 time_stamp) override {
NOTIMPLEMENTED();
return false;
}
- virtual bool Reset(uint32 fourcc,
- int w,
- int h,
- int dw,
- int dh,
- uint8* sample,
- size_t sample_size,
- size_t pixel_width,
- size_t pixel_height,
- int64 elapsed_time,
- int64 time_stamp,
- int rotation) override {
+ bool Reset(uint32 fourcc,
+ int w,
+ int h,
+ int dw,
+ int dh,
+ uint8* sample,
+ size_t sample_size,
+ size_t pixel_width,
+ size_t pixel_height,
+ int64 elapsed_time,
+ int64 time_stamp,
+ int rotation) override {
NOTIMPLEMENTED();
return false;
}
- virtual bool MakeExclusive() override {
+ bool MakeExclusive() override {
NOTIMPLEMENTED();
return false;
}
- virtual size_t CopyToBuffer(uint8* buffer, size_t size) const override {
+ size_t CopyToBuffer(uint8* buffer, size_t size) const override {
NOTIMPLEMENTED();
return 0;
}
protected:
// TODO(magjed): Refactor as a static method in WebRtcVideoFrame.
- virtual VideoFrame* CreateEmptyFrame(int w,
- int h,
- size_t pixel_width,
- size_t pixel_height,
- int64 elapsed_time,
- int64 time_stamp) const override {
+ VideoFrame* CreateEmptyFrame(int w,
+ int h,
+ size_t pixel_width,
+ size_t pixel_height,
+ int64 elapsed_time,
+ int64 time_stamp) const override {
DCHECK(thread_checker_.CalledOnValidThread());
VideoFrame* frame = new cricket::WebRtcVideoFrame();
frame->InitToBlack(
@@ -264,7 +264,7 @@
return &captured_frame_;
}
- virtual cricket::VideoFrame* CreateAliasedFrame(
+ cricket::VideoFrame* CreateAliasedFrame(
const cricket::CapturedFrame* captured_frame,
int dst_width,
int dst_height) const override {
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc
index 250124d..1e580931 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc
@@ -21,7 +21,7 @@
adapter_.SignalFrameCaptured.connect(
this, &WebRtcVideoCapturerAdapterTest::OnFrameCaptured);
}
- virtual ~WebRtcVideoCapturerAdapterTest() {}
+ ~WebRtcVideoCapturerAdapterTest() override {}
void TestSourceCropFrame(int capture_width,
int capture_height,
diff --git a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc
index 2721f6c..5b6499b 100644
--- a/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc
+++ b/content/renderer/media/webrtc_local_audio_source_provider_unittest.cc
@@ -19,7 +19,7 @@
class WebRtcLocalAudioSourceProviderTest : public testing::Test {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
source_params_.Reset(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
media::CHANNEL_LAYOUT_MONO, 1, 48000, 16, 480);
sink_params_.Reset(
@@ -51,7 +51,7 @@
source_provider_->OnSetFormat(source_params_);
}
- virtual void TearDown() override {
+ void TearDown() override {
source_provider_.reset();
blink_track_.reset();
blink::WebHeap::collectAllGarbageForTesting();
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc
index 947eab1c..35ab61e 100644
--- a/content/renderer/media/webrtc_local_audio_track_unittest.cc
+++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc
@@ -168,7 +168,7 @@
class WebRtcLocalAudioTrackTest : public ::testing::Test {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
params_.Reset(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
media::CHANNEL_LAYOUT_STEREO, 2, 48000, 16, 480);
MockMediaConstraintFactory constraint_factory;
@@ -191,7 +191,7 @@
capturer_->SetCapturerSourceForTesting(capturer_source_, params_);
}
- virtual void TearDown() override {
+ void TearDown() override {
blink_source_.reset();
blink::WebHeap::collectAllGarbageForTesting();
}
diff --git a/content/renderer/mouse_lock_dispatcher_browsertest.cc b/content/renderer/mouse_lock_dispatcher_browsertest.cc
index ef18331..2a0fd6b 100644
--- a/content/renderer/mouse_lock_dispatcher_browsertest.cc
+++ b/content/renderer/mouse_lock_dispatcher_browsertest.cc
@@ -28,14 +28,14 @@
// fixture containing a RenderViewImpl view() and interacting to that interface.
class MouseLockDispatcherTest : public RenderViewTest {
public:
- virtual void SetUp() {
+ void SetUp() override {
RenderViewTest::SetUp();
route_id_ = view()->GetRoutingID();
target_ = new MockLockTarget();
alternate_target_ = new MockLockTarget();
}
- virtual void TearDown() {
+ void TearDown() override {
RenderViewTest::TearDown();
delete target_;
delete alternate_target_;
diff --git a/content/renderer/pepper/host_var_tracker_unittest.cc b/content/renderer/pepper/host_var_tracker_unittest.cc
index 3c8bff2..32e9e56 100644
--- a/content/renderer/pepper/host_var_tracker_unittest.cc
+++ b/content/renderer/pepper/host_var_tracker_unittest.cc
@@ -70,7 +70,7 @@
public:
HostVarTrackerTest() {}
- virtual void TearDown() override {
+ void TearDown() override {
v8::Isolate::GetCurrent()->RequestGarbageCollectionForTesting(
v8::Isolate::kFullGarbageCollection);
EXPECT_EQ(0, g_v8objects_alive);
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
index b5608495..c51502e 100644
--- a/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
+++ b/content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc
@@ -81,7 +81,7 @@
PP_DEVICETYPE_DEV_AUDIOCAPTURE,
GURL("http://example.com")) {}
- virtual ~PepperDeviceEnumerationHostHelperTest() {}
+ ~PepperDeviceEnumerationHostHelperTest() override {}
void SimulateMonitorDeviceChangeReceived(uint32_t callback_id) {
PpapiHostMsg_DeviceEnumeration_MonitorDeviceChange msg(callback_id);
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
index 6f52b04..3df6520 100644
--- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -33,14 +33,14 @@
public:
PepperFileChooserHostTest() : pp_instance_(123456) {}
- virtual void SetUp() {
+ void SetUp() override {
SetContentClient(&client_);
RenderViewTest::SetUp();
ppapi::ProxyLock::DisableLockingOnThreadForTest();
globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
}
- virtual void TearDown() {
+ void TearDown() override {
globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_);
RenderViewTest::TearDown();
diff --git a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
index 805a067..b0f7bdf 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host_unittest.cc
@@ -33,7 +33,7 @@
PepperGraphics2DHostTest() : renderer_ppapi_host_(NULL, 12345) {}
- virtual ~PepperGraphics2DHostTest() {
+ ~PepperGraphics2DHostTest() override {
ppapi::ProxyAutoLock proxy_lock;
host_.reset();
}
diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc
index bafccfe2..e9008ec5 100644
--- a/content/renderer/pepper/pepper_url_request_unittest.cc
+++ b/content/renderer/pepper/pepper_url_request_unittest.cc
@@ -57,7 +57,7 @@
// url_request_info_util.cc to detect that this is a test instance.
URLRequestInfoTest() : pp_instance_(-1) {}
- virtual void SetUp() override {
+ void SetUp() override {
RenderViewTest::SetUp();
ppapi::ProxyLock::DisableLockingOnThreadForTest();
@@ -68,7 +68,7 @@
ppapi::proxy::Connection(), pp_instance_, URLRequestInfoData());
}
- virtual void TearDown() override {
+ void TearDown() override {
test_globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_);
RenderViewTest::TearDown();
}
diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc
index 8361dd8..f43d66a0 100644
--- a/content/renderer/pepper/v8_var_converter_unittest.cc
+++ b/content/renderer/pepper/v8_var_converter_unittest.cc
@@ -169,16 +169,16 @@
dummy,
scoped_ptr<ResourceConverter>(new MockResourceConverter).Pass()));
}
- virtual ~V8VarConverterTest() {}
+ ~V8VarConverterTest() override {}
// testing::Test implementation.
- virtual void SetUp() {
+ void SetUp() override {
ProxyLock::Acquire();
v8::HandleScope handle_scope(isolate_);
v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate_);
context_.Reset(isolate_, v8::Context::New(isolate_, NULL, global));
}
- virtual void TearDown() {
+ void TearDown() override {
context_.Reset();
ASSERT_TRUE(PpapiGlobals::Get()->GetVarTracker()->GetLiveVars().empty());
ProxyLock::Release();
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index 1afb439..e98822e 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -19,7 +19,7 @@
class RenderThreadImplBrowserTest : public testing::Test {
public:
- virtual ~RenderThreadImplBrowserTest() {}
+ ~RenderThreadImplBrowserTest() override {}
};
class DummyListener : public IPC::Listener {
diff --git a/content/renderer/render_thread_impl_unittest.cc b/content/renderer/render_thread_impl_unittest.cc
index 262b21a..659eba44 100644
--- a/content/renderer/render_thread_impl_unittest.cc
+++ b/content/renderer/render_thread_impl_unittest.cc
@@ -14,9 +14,10 @@
RenderThreadImplUnittest()
: kCustomizableHistogram_("Histogram1"),
kNormalHistogram_("Histogram2") {}
- virtual ~RenderThreadImplUnittest() {}
+ ~RenderThreadImplUnittest() override {}
+
protected:
- virtual void SetUp() override {
+ void SetUp() override {
histogram_customizer_.custom_histograms_.clear();
histogram_customizer_.custom_histograms_.insert(kCustomizableHistogram_);
}
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 1a23f58c..484d5d6 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -141,9 +141,9 @@
mock_keyboard_.reset(new MockKeyboard());
}
- virtual ~RenderViewImplTest() {}
+ ~RenderViewImplTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
RenderViewTest::SetUp();
// Enable Blink's experimental and test only features so that test code
// does not have to bother enabling each feature.
diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc
index e49bffd..e0dbc83 100644
--- a/content/renderer/render_widget_unittest.cc
+++ b/content/renderer/render_widget_unittest.cc
@@ -20,7 +20,7 @@
class RenderWidgetUnittest : public testing::Test {
public:
RenderWidgetUnittest() {}
- virtual ~RenderWidgetUnittest() {}
+ ~RenderWidgetUnittest() override {}
private:
MockRenderProcess render_process_;
diff --git a/content/renderer/scheduler/task_queue_manager.cc b/content/renderer/scheduler/task_queue_manager.cc
index 227a7e87..658aef7 100644
--- a/content/renderer/scheduler/task_queue_manager.cc
+++ b/content/renderer/scheduler/task_queue_manager.cc
@@ -16,14 +16,13 @@
TaskQueue(TaskQueueManager* task_queue_manager);
// base::SingleThreadTaskRunner implementation.
- virtual bool RunsTasksOnCurrentThread() const override;
- virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
- const base::Closure& task,
- base::TimeDelta delay) override;
- virtual bool PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
- const base::Closure& task,
- base::TimeDelta delay) override;
+ bool RunsTasksOnCurrentThread() const override;
+ bool PostDelayedTask(const tracked_objects::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay) override;
+ bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay) override;
// Adds a task at the end of the incoming task queue and schedules a call to
// TaskQueueManager::DoWork() if the incoming queue was empty and automatic
@@ -43,7 +42,7 @@
base::TaskQueue& work_queue() { return work_queue_; }
private:
- virtual ~TaskQueue();
+ ~TaskQueue() override;
void PumpQueueLocked();
void EnqueueTaskLocked(const base::PendingTask& pending_task);
diff --git a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc
index fd9a73d..4d771416 100644
--- a/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc
+++ b/content/renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc
@@ -66,7 +66,7 @@
class ScreenOrientationDispatcherTest : public testing::Test {
protected:
- virtual void SetUp() override {
+ void SetUp() override {
dispatcher_.reset(new ScreenOrientationDispatcherWithSink(&sink_));
}
diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/renderer/v8_value_converter_impl_unittest.cc
index 2b44b12..5cd30a9f 100644
--- a/content/renderer/v8_value_converter_impl_unittest.cc
+++ b/content/renderer/v8_value_converter_impl_unittest.cc
@@ -51,15 +51,13 @@
}
protected:
- virtual void SetUp() {
+ void SetUp() override {
v8::HandleScope handle_scope(isolate_);
v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate_);
context_.Reset(isolate_, v8::Context::New(isolate_, NULL, global));
}
- virtual void TearDown() {
- context_.Reset();
- }
+ void TearDown() override { context_.Reset(); }
std::string GetString(base::DictionaryValue* value, const std::string& key) {
std::string temp;
