commit 14665ff7d4024d07e58622f498b23fd980001871
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 7548808544f25988d15e2d0172e92474a228756a
parent 792f1a14e2b62382c5c6080d0b8fdc5c89d27bc6

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

talk/media/webrtc/webrtcvideoengine2_unittest.h

diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.h b/talk/media/webrtc/webrtcvideoengine2_unittest.h
index cf2539b..1149949 100644
--- a/talk/media/webrtc/webrtcvideoengine2_unittest.h
+++ b/talk/media/webrtc/webrtcvideoengine2_unittest.h
@@ -54,16 +54,16 @@
   void SetStats(const webrtc::VideoSendStream::Stats& stats);
 
  private:
-  virtual void SwapFrame(webrtc::I420VideoFrame* frame) OVERRIDE;
-  virtual webrtc::VideoSendStream::Stats GetStats() OVERRIDE;
+  void SwapFrame(webrtc::I420VideoFrame* frame) override;
+  webrtc::VideoSendStream::Stats GetStats() override;
 
-  virtual bool ReconfigureVideoEncoder(
-      const webrtc::VideoEncoderConfig& config) OVERRIDE;
+  bool ReconfigureVideoEncoder(
+      const webrtc::VideoEncoderConfig& config) override;
 
-  virtual webrtc::VideoSendStreamInput* Input() OVERRIDE;
+  webrtc::VideoSendStreamInput* Input() override;
 
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
+  void Start() override;
+  void Stop() override;
 
   bool sending_;
   webrtc::VideoSendStream::Config config_;
@@ -89,10 +89,10 @@
   void SetStats(const webrtc::VideoReceiveStream::Stats& stats);
 
  private:
-  virtual webrtc::VideoReceiveStream::Stats GetStats() const OVERRIDE;
+  webrtc::VideoReceiveStream::Stats GetStats() const override;
 
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
+  void Start() override;
+  void Stop() override;
 
   webrtc::VideoReceiveStream::Config config_;
   bool receiving_;
@@ -123,25 +123,24 @@
   void SetStats(const webrtc::Call::Stats& stats);
 
  private:
-  virtual webrtc::VideoSendStream* CreateVideoSendStream(
+  webrtc::VideoSendStream* CreateVideoSendStream(
       const webrtc::VideoSendStream::Config& config,
-      const webrtc::VideoEncoderConfig& encoder_config) OVERRIDE;
+      const webrtc::VideoEncoderConfig& encoder_config) override;
 
-  virtual void DestroyVideoSendStream(
-      webrtc::VideoSendStream* send_stream) OVERRIDE;
+  void DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) override;
 
-  virtual webrtc::VideoReceiveStream* CreateVideoReceiveStream(
-      const webrtc::VideoReceiveStream::Config& config) OVERRIDE;
+  webrtc::VideoReceiveStream* CreateVideoReceiveStream(
+      const webrtc::VideoReceiveStream::Config& config) override;
 
-  virtual void DestroyVideoReceiveStream(
-      webrtc::VideoReceiveStream* receive_stream) OVERRIDE;
-  virtual webrtc::PacketReceiver* Receiver() OVERRIDE;
+  void DestroyVideoReceiveStream(
+      webrtc::VideoReceiveStream* receive_stream) override;
+  webrtc::PacketReceiver* Receiver() override;
 
-  virtual webrtc::Call::Stats GetStats() const OVERRIDE;
+  webrtc::Call::Stats GetStats() const override;
 
-  virtual void SetBitrateConfig(
-      const webrtc::Call::Config::BitrateConfig& bitrate_config) OVERRIDE;
-  virtual void SignalNetworkState(webrtc::Call::NetworkState state) OVERRIDE;
+  void SetBitrateConfig(
+      const webrtc::Call::Config::BitrateConfig& bitrate_config) override;
+  void SignalNetworkState(webrtc::Call::NetworkState state) override;
 
   webrtc::Call::Config config_;
   webrtc::Call::NetworkState network_state_;