Update {virtual,override} to follow C++11 style in content/renderer/media.

This CL has just two files which got some extra "while I'm in there" cleanup while doing mechanical fixups across the codebase.

The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.

BUG=417463

Review URL: https://codereview.chromium.org/1106043002

Cr-Commit-Position: refs/heads/master@{#326972}

content/renderer/media/mock_peer_connection_impl.h

@@ -25,61 +25,55 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
                                   webrtc::PeerConnectionObserver* observer);
 
   // PeerConnectionInterface implementation.
-  virtual rtc::scoped_refptr<webrtc::StreamCollectionInterface>
+  rtc::scoped_refptr<webrtc::StreamCollectionInterface>
       local_streams() override;
-  virtual rtc::scoped_refptr<webrtc::StreamCollectionInterface>
+  rtc::scoped_refptr<webrtc::StreamCollectionInterface>
       remote_streams() override;
-  virtual bool AddStream(
+  bool AddStream(
       webrtc::MediaStreamInterface* local_stream) override;
-  virtual void RemoveStream(
+  void RemoveStream(
       webrtc::MediaStreamInterface* local_stream) override;
-  virtual rtc::scoped_refptr<webrtc::DtmfSenderInterface>
+  rtc::scoped_refptr<webrtc::DtmfSenderInterface>
       CreateDtmfSender(webrtc::AudioTrackInterface* track) override;
-  virtual rtc::scoped_refptr<webrtc::DataChannelInterface>
+  rtc::scoped_refptr<webrtc::DataChannelInterface>
       CreateDataChannel(const std::string& label,
                         const webrtc::DataChannelInit* config) override;
-
-  virtual bool GetStats(webrtc::StatsObserver* observer,
-                        webrtc::MediaStreamTrackInterface* track) {
-    return false;
-  }
-  virtual bool GetStats(webrtc::StatsObserver* observer,
-                        webrtc::MediaStreamTrackInterface* track,
-                        StatsOutputLevel level) override;
+  bool GetStats(webrtc::StatsObserver* observer,
+                webrtc::MediaStreamTrackInterface* track,
+                StatsOutputLevel level) override;
 
   // Set Call this function to make sure next call to GetStats fail.
   void SetGetStatsResult(bool result) { getstats_result_ = result; }
 
-  virtual SignalingState signaling_state() override {
+  SignalingState signaling_state() override {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kStable;
   }
-  virtual IceState ice_state() override {
+  IceState ice_state() override {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kIceNew;
   }
-  virtual IceConnectionState ice_connection_state() override {
+  IceConnectionState ice_connection_state() override {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kIceConnectionNew;
   }
-  virtual IceGatheringState ice_gathering_state() override {
+  IceGatheringState ice_gathering_state() override {
     NOTIMPLEMENTED();
     return PeerConnectionInterface::kIceGatheringNew;
   }
-  virtual void Close() override {
+  void Close() override {
     NOTIMPLEMENTED();
   }
 
-  virtual const webrtc::SessionDescriptionInterface* local_description()
-      const override;
-  virtual const webrtc::SessionDescriptionInterface* remote_description()
+  const webrtc::SessionDescriptionInterface* local_description() const override;
+  const webrtc::SessionDescriptionInterface* remote_description()
       const override;
 
   // JSEP01 APIs
-  virtual void CreateOffer(
+  void CreateOffer(
       webrtc::CreateSessionDescriptionObserver* observer,
       const webrtc::MediaConstraintsInterface* constraints) override;
-  virtual void CreateAnswer(
+  void CreateAnswer(
       webrtc::CreateSessionDescriptionObserver* observer,
       const webrtc::MediaConstraintsInterface* constraints) override;
   MOCK_METHOD2(SetLocalDescription,
@@ -94,12 +88,10 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
   void SetRemoteDescriptionWorker(
       webrtc::SetSessionDescriptionObserver* observer,
       webrtc::SessionDescriptionInterface* desc);
-  virtual bool UpdateIce(
-      const IceServers& configuration,
-      const webrtc::MediaConstraintsInterface* constraints) override;
-  virtual bool AddIceCandidate(
-      const webrtc::IceCandidateInterface* candidate) override;
-  virtual void RegisterUMAObserver(webrtc::UMAObserver* observer) override;
+  bool UpdateIce(const IceServers& configuration,
+                 const webrtc::MediaConstraintsInterface* constraints) override;
+  bool AddIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
+  void RegisterUMAObserver(webrtc::UMAObserver* observer) override;
 
   void AddRemoteStream(webrtc::MediaStreamInterface* stream);
 

content/renderer/media/rtc_data_channel_handler.h

@@ -37,26 +37,24 @@ class CONTENT_EXPORT RtcDataChannelHandler
   RtcDataChannelHandler(
       const scoped_refptr<base::SingleThreadTaskRunner>& main_thread,
       webrtc::DataChannelInterface* channel);
-  virtual ~RtcDataChannelHandler();
+  ~RtcDataChannelHandler() override;
 
   // blink::WebRTCDataChannelHandler implementation.
-  virtual void setClient(
+  void setClient(
       blink::WebRTCDataChannelHandlerClient* client) override;
-  virtual blink::WebString label() override;
-  virtual bool isReliable() override;
-  virtual bool ordered() const override;
-  virtual unsigned short maxRetransmitTime() const override;
-  virtual unsigned short maxRetransmits() const override;
-  virtual blink::WebString protocol() const override;
-  virtual bool negotiated() const override;
-  virtual unsigned short id() const override;
-  // TODO(bemasc): Mark |state()| as |override| once https://codereview.chromium.org/782843003/
-  // lands in Blink and rolls into Chromium.
-  virtual blink::WebRTCDataChannelHandlerClient::ReadyState state() const;
-  virtual unsigned long bufferedAmount() override;
-  virtual bool sendStringData(const blink::WebString& data) override;
-  virtual bool sendRawData(const char* data, size_t length) override;
-  virtual void close() override;
+  blink::WebString label() override;
+  bool isReliable() override;
+  bool ordered() const override;
+  unsigned short maxRetransmitTime() const override;
+  unsigned short maxRetransmits() const override;
+  blink::WebString protocol() const override;
+  bool negotiated() const override;
+  unsigned short id() const override;
+  blink::WebRTCDataChannelHandlerClient::ReadyState state() const override;
+  unsigned long bufferedAmount() override;
+  bool sendStringData(const blink::WebString& data) override;
+  bool sendRawData(const char* data, size_t length) override;
+  void close() override;
 
   const scoped_refptr<webrtc::DataChannelInterface>& channel() const;