commit 860ac53b43345024474a593012f03710d4d7a3b4
author kjellander@webrtc.org <kjellander@webrtc.org> Wed Mar 04 12:58:35 2015
committer kjellander@webrtc.org <kjellander@webrtc.org> Wed Mar 04 13:04:54 2015
tree b562f092bcffc6cb344ecbb5f49bd13fd0535fdf
parent 3ada29bb64a89ebfa8f2516a1e5096bbf966525e

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-Original-Commit-Position: refs/heads/master@{#8596}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 14665ff7d4024d07e58622f498b23fd980001871

test/configurable_frame_size_encoder.h

diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h
index 24f6be8..eed4498 100644
--- a/test/configurable_frame_size_encoder.h
+++ b/test/configurable_frame_size_encoder.h
@@ -24,28 +24,26 @@
   explicit ConfigurableFrameSizeEncoder(size_t max_frame_size);
   virtual ~ConfigurableFrameSizeEncoder();
 
-  virtual int32_t InitEncode(const VideoCodec* codec_settings,
-                             int32_t number_of_cores,
-                             size_t max_payload_size) OVERRIDE;
+  int32_t InitEncode(const VideoCodec* codec_settings,
+                     int32_t number_of_cores,
+                     size_t max_payload_size) override;
 
-  virtual int32_t Encode(const I420VideoFrame& input_image,
-                         const CodecSpecificInfo* codec_specific_info,
-                         const std::vector<VideoFrameType>* frame_types)
-      OVERRIDE;
+  int32_t Encode(const I420VideoFrame& input_image,
+                 const CodecSpecificInfo* codec_specific_info,
+                 const std::vector<VideoFrameType>* frame_types) override;
 
-  virtual int32_t RegisterEncodeCompleteCallback(EncodedImageCallback* callback)
-      OVERRIDE;
+  int32_t RegisterEncodeCompleteCallback(
+      EncodedImageCallback* callback) override;
 
-  virtual int32_t Release() OVERRIDE;
+  int32_t Release() override;
 
-  virtual int32_t SetChannelParameters(uint32_t packet_loss,
-                                       int64_t rtt) OVERRIDE;
+  int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
 
-  virtual int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) OVERRIDE;
+  int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) override;
 
-  virtual int32_t SetPeriodicKeyFrames(bool enable) OVERRIDE;
+  int32_t SetPeriodicKeyFrames(bool enable) override;
 
-  virtual int32_t CodecConfigParameters(uint8_t* buffer, int32_t size) OVERRIDE;
+  int32_t CodecConfigParameters(uint8_t* buffer, int32_t size) override;
 
   int32_t SetFrameSize(size_t size);