Roll chromium_revision e144d30..6fdb142 (318658:318841) + remove OVERRIDE macro
Clang version changed 223108:230914
Details: https://chromium.googlesource.com/chromium/src/+/e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
index 586d8da..477276b 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
@@ -27,14 +27,13 @@
virtual ~RtcpBandwidthObserverImpl() {
}
// Received RTCP REMB or TMMBR.
- virtual void OnReceivedEstimatedBitrate(uint32_t bitrate) OVERRIDE {
+ void OnReceivedEstimatedBitrate(uint32_t bitrate) override {
owner_->OnReceivedEstimatedBitrate(bitrate);
}
// Received RTCP receiver block.
- virtual void OnReceivedRtcpReceiverReport(
- const ReportBlockList& report_blocks,
- int64_t rtt,
- int64_t now_ms) OVERRIDE {
+ void OnReceivedRtcpReceiverReport(const ReportBlockList& report_blocks,
+ int64_t rtt,
+ int64_t now_ms) override {
if (report_blocks.empty())
return;
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
index 1646f75..f089be9 100644
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.h
@@ -32,23 +32,23 @@
BitrateControllerImpl(Clock* clock, BitrateObserver* observer);
virtual ~BitrateControllerImpl();
- virtual bool AvailableBandwidth(uint32_t* bandwidth) const override;
+ bool AvailableBandwidth(uint32_t* bandwidth) const override;
- virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
+ RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
- virtual void SetStartBitrate(int start_bitrate_bps) override;
- virtual void SetMinMaxBitrate(int min_bitrate_bps,
+ void SetStartBitrate(int start_bitrate_bps) override;
+ void SetMinMaxBitrate(int min_bitrate_bps,
int max_bitrate_bps) override;
- virtual void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
+ void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
- virtual int64_t TimeUntilNextProcess() override;
- virtual int32_t Process() override;
+ int64_t TimeUntilNextProcess() override;
+ int32_t Process() override;
// Current bitrate actually being sent.
- virtual void SetBitrateSent(uint32_t bitrate_sent_bps) override;
+ void SetBitrateSent(uint32_t bitrate_sent_bps) override;
- virtual void SetCodecMode(webrtc::VideoCodecMode mode) override;
+ void SetCodecMode(webrtc::VideoCodecMode mode) override;
private:
class RtcpBandwidthObserverImpl;
diff --git a/webrtc/modules/bitrate_controller/remb_suppressor_unittest.cc b/webrtc/modules/bitrate_controller/remb_suppressor_unittest.cc
index 7ce99a1..834ec5f 100644
--- a/webrtc/modules/bitrate_controller/remb_suppressor_unittest.cc
+++ b/webrtc/modules/bitrate_controller/remb_suppressor_unittest.cc
@@ -20,7 +20,7 @@
explicit TestSuppressor(webrtc::Clock* clock) : RembSuppressor(clock) {}
virtual ~TestSuppressor() {}
- virtual bool Enabled() OVERRIDE { return true; }
+ bool Enabled() override { return true; }
};
class RembSuppressorTest : public ::testing::Test {
