Chromium roll (https://codereview.chromium.org/976353002)

mojo/edk/system/data_pipe.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_DATA_PIPE_H_
 #define MOJO_EDK_SYSTEM_DATA_PIPE_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
@@ skipping 212 matching lines @@
   // current version of the struct) and |capacity_num_bytes| must be nonzero.
   // TODO(vtl): |has_local_producer|/|has_local_consumer| shouldn't really be
   // arguments here. Instead, they should be determined from the |impl| ... but
   // the |impl|'s typically figures these out by examining the owner, i.e., the
   // |DataPipe| object. Probably, this indicates that more stuff should be moved
   // to |DataPipeImpl|, but for now we'll live with this.
   DataPipe(bool has_local_producer,
            bool has_local_consumer,
            const MojoCreateDataPipeOptions& validated_options,
            scoped_ptr<DataPipeImpl> impl);
-  virtual ~DataPipe();
+  ~DataPipe() override;
 
   // |ChannelEndpointClient| implementation:
   bool OnReadMessage(unsigned port, MessageInTransit* message) override;
   void OnDetachFromChannel(unsigned port) override;
 
   void AwakeProducerAwakablesForStateChangeNoLock(
       const HandleSignalsState& new_producer_state);
   void AwakeConsumerAwakablesForStateChangeNoLock(
       const HandleSignalsState& new_consumer_state);
 
@@ skipping 24 matching lines @@
   uint32_t consumer_two_phase_max_num_bytes_read_;
   scoped_ptr<DataPipeImpl> impl_;
 
   DISALLOW_COPY_AND_ASSIGN(DataPipe);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DATA_PIPE_H_